Setting UFN prefix to NULL should clear prefix, not cause crash

diff --git a/CHANGES b/CHANGES
index ea402faedb2d0fce166ca48bd854eb1c3b8c8d85..dffd629777265912ebcf7f38141dec569563bb21 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ Changes included in OpenLDAP 1.2.11 Release Engineering
        Fix slurpd to properly restart in oneshot mode, and to report a
                non-zero number of items to process with only one replica.
        Fix strdup use in libldap/request.c
+       Fix NULL prefix bug in libldap/ufn.c
 
 Changes included in OpenLDAP 1.2.10
        CVS Tag: OPENLDAP_REL_ENG_1_2_10

diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c
index b269bd034474f483b9b59468577d89e18f902fd0..d3bfc63839a0725defc5a8c3e4db3e03ba6d3d9a 100644 (file)
--- a/libraries/libldap/ufn.c
+++ b/libraries/libldap/ufn.c
@@ -476,7 +476,8 @@ ldap_ufn_setprefix( LDAP *ld, char *prefix )
        if ( ld->ld_ufnprefix != NULL )
                free( ld->ld_ufnprefix );
 
-       ld->ld_ufnprefix = ldap_strdup( prefix );
+       ld->ld_ufnprefix = prefix == NULL
+               ? NULL : ldap_strdup( prefix );
 }
 
 int