summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-10-05 14:16:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:04:51 -0500
commitf1ece089caa1512b583b313b46d7f3888c65580b (patch)
tree72372deb10f4b1bc1c04c38cbfdcfed8c1cb4128
parent2237bc6a4275a6c02196552b14b1632709917328 (diff)
downloadsamba-f1ece089caa1512b583b313b46d7f3888c65580b.tar.gz
samba-f1ece089caa1512b583b313b46d7f3888c65580b.tar.bz2
samba-f1ece089caa1512b583b313b46d7f3888c65580b.zip
r10730: Janitor for tridge on the "fix to talloc_parent() from Michael O'Brien".
Jeremy. (This used to be commit 2f3750d95b75b186771cab13b842c91bd7926df1)
-rw-r--r--source3/lib/talloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index 98cba8597e..2df4588f42 100644
--- a/source3/lib/talloc.c
+++ b/source3/lib/talloc.c
@@ -158,7 +158,7 @@ static struct talloc_chunk *talloc_parent_chunk(const void *ptr)
void *talloc_parent(const void *ptr)
{
struct talloc_chunk *tc = talloc_parent_chunk(ptr);
- return (void *)(tc+1);
+ return tc ? (void *)(tc+1) : NULL;
}
/*