svn commit: samba r10730 - in branches/SAMBA_3_0/source/lib: .

[jra at samba.org]

Author: jra
Date: 2005-10-05 14:16:09 +0000 (Wed, 05 Oct 2005)
New Revision: 10730

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

Log:
Janitor for tridge on the "fix to talloc_parent() from Michael O'Brien".
Jeremy.

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


Changeset:
Modified: branches/SAMBA_3_0/source/lib/talloc.c
===================================================================
--- branches/SAMBA_3_0/source/lib/talloc.c	2005-10-05 14:16:07 UTC (rev 10729)
+++ branches/SAMBA_3_0/source/lib/talloc.c	2005-10-05 14:16:09 UTC (rev 10730)
@@ -158,7 +158,7 @@
 void *talloc_parent(const void *ptr)
 {
 	struct talloc_chunk *tc = talloc_parent_chunk(ptr);
-	return (void *)(tc+1);
+	return tc ? (void *)(tc+1) : NULL;
 }
 
 /*