diff options
| -rw-r--r-- | librpc/ndr/ndr_string.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c index 402cf4e4ad..9cc26dacc5 100644 --- 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; |