summaryrefslogtreecommitdiff
path: root/source3/rpc_parse/parse_misc.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-11-17 22:07:47 +0000
committerJeremy Allison <jra@samba.org>2003-11-17 22:07:47 +0000
commite0fd9d28e90dbc6dab9a0d17e2f0403fa2f21e98 (patch)
tree6fba9b3ba97433b4200de55143c662f0289e1d18 /source3/rpc_parse/parse_misc.c
parent5faae2df8aa6b8864cc42599d8a9c69925b94937 (diff)
downloadsamba-e0fd9d28e90dbc6dab9a0d17e2f0403fa2f21e98.tar.gz
samba-e0fd9d28e90dbc6dab9a0d17e2f0403fa2f21e98.tar.bz2
samba-e0fd9d28e90dbc6dab9a0d17e2f0403fa2f21e98.zip
Fix from Andrew Bartlett to fix up the munged-dial problem.
Jeremy. (This used to be commit 703b1b76e25fc83b3b84767c0e1b64c97c21bf09)
Diffstat (limited to 'source3/rpc_parse/parse_misc.c')
-rw-r--r--source3/rpc_parse/parse_misc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 203122e73c..afdf0fc4c9 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -1015,7 +1015,11 @@ void init_unistr2_from_datablob(UNISTR2 *str, DATA_BLOB *blob)
str->uni_str_len = blob->length / sizeof(uint16);
str->uni_max_len = str->uni_str_len;
str->offset = 0;
- str->buffer = (uint16 *) memdup(blob->data, blob->length);
+ if (blob->length) {
+ str->buffer = (uint16 *) memdup(blob->data, blob->length);
+ } else {
+ str->buffer = NULL;
+ }
if ((str->buffer == NULL) && (blob->length > 0)) {
smb_panic("init_unistr2_from_datablob: malloc fail\n");
}