diff options
author | Tim Potter <tpot@samba.org> | 2003-05-28 00:59:35 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2003-05-28 00:59:35 +0000 |
commit | d41705dec6bed752acfe3210c73a949101dc23f6 (patch) | |
tree | 52ef1b9e14eea4ff7f8cfd850914b86af6e96960 | |
parent | 43e01fb2306f35931256dfda6803bd887f28059f (diff) | |
download | samba-d41705dec6bed752acfe3210c73a949101dc23f6.tar.gz samba-d41705dec6bed752acfe3210c73a949101dc23f6.tar.xz samba-d41705dec6bed752acfe3210c73a949101dc23f6.zip |
Merge of rpcstr_pull() termination fixes from 3.0
-rw-r--r-- | source/lib/util_unistr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c index 08bb03986f1..5df0828295f 100644 --- a/source/lib/util_unistr.c +++ b/source/lib/util_unistr.c @@ -229,7 +229,10 @@ char *skip_unibuf(char *src, size_t len) */ int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags) { - if (!src) return 0; + if (!src) { + dest[0] = 0; + return 0; + } if(dest_len==-1) dest_len=MAXUNI-3; return pull_ucs2(NULL, dest, src, dest_len, src_len, flags|STR_UNICODE|STR_NOALIGN); } |