summaryrefslogtreecommitdiffstats
path: root/source/lib/talloc.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-10-05 14:16:09 +0000
committerJeremy Allison <jra@samba.org>2005-10-05 14:16:09 +0000
commit0f9f8f54d98f4b3fcb216bdc6fb6d89a430d7f85 (patch)
treec81b6e0524ce8978758c2a6dc3d115a3ca50b928 /source/lib/talloc.c
parent7253894dd898e8d0933f6467eafa01e60e79ddd5 (diff)
downloadsamba-0f9f8f54d98f4b3fcb216bdc6fb6d89a430d7f85.tar.gz
samba-0f9f8f54d98f4b3fcb216bdc6fb6d89a430d7f85.tar.xz
samba-0f9f8f54d98f4b3fcb216bdc6fb6d89a430d7f85.zip
r10730: Janitor for tridge on the "fix to talloc_parent() from Michael O'Brien".
Jeremy.
Diffstat (limited to 'source/lib/talloc.c')
-rw-r--r--source/lib/talloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/lib/talloc.c b/source/lib/talloc.c
index 98cba8597e8..2df4588f425 100644
--- a/source/lib/talloc.c
+++ b/source/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;
}
/*