librpc:ndr: Set the length to 1 if we assign and empty string

CID #1399648

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c
index f9366b494a8c5af58ee7071d3df0103d09f546aa..067f91781eeb416799c656b32856cd3e8f7927d2 100644 (file)
--- a/librpc/ndr/ndr_string.c
+++ b/librpc/ndr/ndr_string.c
@@ -677,6 +677,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_charset_to_null(struct ndr_push *ndr, int nd
 
        if (str == NULL) {
                str = "";
+               length = 1;
        }
 
        return ndr_push_charset(ndr, ndr_flags, str, length, byte_mul, chset);