From f037427ed2855411cafe4278666ca6d46e8e4e46 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 14 Aug 2000 21:20:56 +0000 Subject: [PATCH] merge from HEAD --- source/rpc_parse/parse_spoolss.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c index 0fd78756d1d..886fd9d5a15 100644 --- a/source/rpc_parse/parse_spoolss.c +++ b/source/rpc_parse/parse_spoolss.c @@ -1634,12 +1634,17 @@ static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, ui return False; l_chaine=str_len_uni(&chaine); - if((chaine2=(uint16 *)Realloc(chaine2, (l_chaine2+l_chaine+1)*sizeof(uint16))) == NULL) + /* extra byte added for appending the double terminating NULL */ + if((chaine2=(uint16 *)Realloc(chaine2, (l_chaine2+l_chaine+2)*sizeof(uint16))) == NULL) return False; memcpy(chaine2+l_chaine2, chaine.buffer, (l_chaine+1)*sizeof(uint16)); l_chaine2+=l_chaine+1; } while(l_chaine!=0); + if (chaine2) + { + chaine2[l_chaine2] = '\0'; + } *string=chaine2; -- 2.11.4.GIT