This doesn't look like it has anything to do with character set conversion, but it...

[mdw/samba.git] / librpc / ndr / ndr_string.c

diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c
index 402cf4e4adbb73cfd776dd126b74f228195fa07c..9cc26dacc5c860172efb0e638077e1540e068a06 100644 (file)
--- a/librpc/ndr/ndr_string.c
+++ b/librpc/ndr/ndr_string.c
@@ -705,17 +705,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int ndr_flags,
        required = byte_mul * length;
        
        NDR_PUSH_NEED_BYTES(ndr, required);
-       ret = convert_string(CH_UNIX, chset, 
+
+       if (required) {
+               ret = convert_string(CH_UNIX, chset, 
                             var, strlen(var),
                             ndr->data+ndr->offset, required);
-       if (ret == -1) {
-               return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
+               if (ret == -1) {
+                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
                                      "Bad character conversion");
-       }
+               }
 
-       /* Make sure the remaining part of the string is filled with zeroes */
-       if (ret < required) {
-               memset(ndr->data+ndr->offset+ret, 0, required-ret);
+               /* Make sure the remaining part of the string is filled with zeroes */
+               if (ret < required) {
+                       memset(ndr->data+ndr->offset+ret, 0, required-ret);
+               }
        }
 
        ndr->offset += required;