svn commit: samba r9300 - in branches/SAMBA_4_0/source/librpc/ndr: .

tridge at samba.org tridge at samba.org
Sat Aug 13 03:17:18 GMT 2005


Author: tridge
Date: 2005-08-13 03:17:18 +0000 (Sat, 13 Aug 2005)
New Revision: 9300

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

Log:
cope with zero length in ndr_pull_charset()


Modified:
   branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2005-08-13 03:16:03 UTC (rev 9299)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2005-08-13 03:17:18 UTC (rev 9300)
@@ -621,6 +621,10 @@
 NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, int chset)
 {
 	int ret;
+	if (length == 0) {
+		*var = talloc_strdup(ndr, "");
+		return NT_STATUS_OK;
+	}
 	NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
 	ret = convert_string_talloc(ndr, chset, CH_UNIX, 
 				    ndr->data+ndr->offset, 



More information about the samba-cvs mailing list