cleanup NULL string handling

diff --git a/libraries/libldap/utf-8-conv.c b/libraries/libldap/utf-8-conv.c
index 29809deca6c70ce83585882c62433d687ef6b115..14cd89e49452e49e9ee02a291c172dc87dae6215 100644 (file)
--- a/libraries/libldap/utf-8-conv.c
+++ b/libraries/libldap/utf-8-conv.c
@@ -130,7 +130,11 @@ ldap_x_utf8s_to_wcs ( wchar_t *wcstr, const char *utf8str, size_t count )
 
 
        /* If input ptr is NULL, treat it as empty string. */
-       if (utf8str == NULL) utf8str = "";
+       if (utf8str == NULL) {
+               if ( wcstr )
+                       *wcstr = 0;
+               return 0;
+       }
 
        /* Examine next UTF-8 character.  If output buffer is NULL, ignore count */
        while ( *utf8str && (wcstr==NULL || wclen<count) ) {