From fd448442d90e062196d8bb48c01c5ea9ea9263b2 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 28 May 2003 00:59:35 +0000
Subject: Merge of rpcstr_pull() termination fixes from 3.0 (This used to be
 commit d41705dec6bed752acfe3210c73a949101dc23f6)

---
 source3/lib/util_unistr.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 08bb03986f..5df0828295 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/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);
 }
-- 
cgit