r25274: Attempt to fix RPC-SAMBA3-GETUSERNAME

[tprouty/samba.git] / source3 / lib / util_unistr.c

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index a4952d137ee04e776e370e86f7185090751a8dbc..64cfd521202d929161f390c130810896d26c1c4a 100644 (file)
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -361,7 +361,7 @@ int rpcstr_push(void* dest, const char *src, size_t dest_len, int flags)
 
 void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen)
 {
-       if (str == NULL) {
+       if ((str == NULL) || (str->uni_str_len == 0)) {
                *dest='\0';
                return;
        }
@@ -374,7 +374,7 @@ void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen)
 
 void unistr3_to_ascii(char *dest, const UNISTR3 *str, size_t maxlen)
 {
-       if (str == NULL) {
+       if ((str == NULL) || (str->uni_str_len == 0)) {
                *dest='\0';
                return;
        }