svn commit: samba r10726 - in branches/SAMBA_4_0/source/lib/talloc: .

tridge at samba.org tridge at samba.org
Wed Oct 5 06:32:01 GMT 2005


Author: tridge
Date: 2005-10-05 06:32:00 +0000 (Wed, 05 Oct 2005)
New Revision: 10726

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

Log:

fix to talloc_parent() from Michael O'Brien

Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c	2005-10-05 01:50:49 UTC (rev 10725)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c	2005-10-05 06:32:00 UTC (rev 10726)
@@ -162,7 +162,7 @@
 void *talloc_parent(const void *ptr)
 {
 	struct talloc_chunk *tc = talloc_parent_chunk(ptr);
-	return TC_PTR_FROM_CHUNK(tc);
+	return tc? TC_PTR_FROM_CHUNK(tc) : NULL;
 }
 
 /* 



More information about the samba-cvs mailing list