Patch by Metze to ensure that we always at least initialize our output string

for rpc_pull_string.  If we had a NULL or zero-length string, we would use
uninitialised data in the result string.

Andrew Bartlett
(This used to be commit df10aee451b431a8a056a949a98393da256185da)

2 files changed, 8 insertions, 1 deletions

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 7acb7147fd..5086f924db 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -420,6 +420,8 @@ size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t src_len,
 
 	if (dest_len)
 		dest[MIN(ret, dest_len-1)] = 0;
+	else
+		dest[0] = 0;
 
 	return src_len;
 }
@@ -629,6 +631,8 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
 	ret = convert_string(CH_UCS2, CH_UNIX, src, src_len, dest, dest_len);
 	if (dest_len)
 		dest[MIN(ret, dest_len-1)] = 0;
+	else 
+		dest[0] = 0;
 
 	return src_len;
 }
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);
 }