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

[metze at samba.org]

Author: metze
Date: 2006-01-11 20:38:10 +0000 (Wed, 11 Jan 2006)
New Revision: 12856

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

Log:
make the logic much more sane

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


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2006-01-11 20:23:02 UTC (rev 12855)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2006-01-11 20:38:10 UTC (rev 12856)
@@ -272,16 +272,20 @@
 				int flags, void *ptr)
 {
 	struct ndr_print *ndr;
-	char *ret;
+	char *ret = NULL;
 
 	ndr = talloc_zero(mem_ctx, struct ndr_print);
 	if (!ndr) return NULL;
-	ndr->private = talloc_strdup(mem_ctx, "");
+	ndr->private = talloc_strdup(ndr, "");
+	if (!ndr->private) {
+		goto failed;
+	}
 	ndr->print = ndr_print_string_helper;
 	ndr->depth = 1;
 	ndr->flags = 0;
 	fn(ndr, name, flags, ptr);
-	ret = ndr->private;
+	ret = talloc_steal(mem_ctx, ndr->private);
+failed:
 	talloc_free(ndr);
 	return ret;
 }