svn commit: samba r15744 - in branches/SAMBA_4_0/source/libcli/smb2: .

[metze at samba.org]

Author: metze
Date: 2006-05-20 11:50:10 +0000 (Sat, 20 May 2006)
New Revision: 15744

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15744

Log:
convert_string_talloc() handles src_len == 0 as error

but it's valid in this case

metze
Modified:
   branches/SAMBA_4_0/source/libcli/smb2/request.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb2/request.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/request.c	2006-05-20 11:03:51 UTC (rev 15743)
+++ branches/SAMBA_4_0/source/libcli/smb2/request.c	2006-05-20 11:50:10 UTC (rev 15744)
@@ -522,6 +522,14 @@
 	status = smb2_pull_o16s16_blob(buf, mem_ctx, ptr, &blob);
 	NT_STATUS_NOT_OK_RETURN(status);
 
+	if (blob.length == 0) {
+		char *s;
+		s = talloc_strdup(mem_ctx, "");
+		NT_STATUS_HAVE_NO_MEMORY(s);
+		*str = s;
+		return NT_STATUS_OK;
+	}
+
 	size = convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, 
 				     blob.data, blob.length, &vstr);
 	data_blob_free(&blob);