diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-10-05 06:32:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:25 -0500 |
| commit | 7838e13e917041fa3786eaa442765ab88b9f0039 (patch) | |
| tree | 6ae448a7672e82aa7c02ff5a3ca565000c6b91f7 /source4/lib/talloc | |
| parent | d220237b19f361a2c3c09b292e11f54c8d522fdf (diff) | |
| download | samba-7838e13e917041fa3786eaa442765ab88b9f0039.tar.gz samba-7838e13e917041fa3786eaa442765ab88b9f0039.tar.bz2 samba-7838e13e917041fa3786eaa442765ab88b9f0039.zip | |
r10726: fix to talloc_parent() from Michael O'Brien
(This used to be commit f31a2376f3fef1cc2b40b37fb4d94a4b67eec6d4)
Diffstat (limited to 'source4/lib/talloc')
| -rw-r--r-- | source4/lib/talloc/talloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index 6af08a2ac9..d2de2ecde0 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/lib/talloc/talloc.c @@ -162,7 +162,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 TC_PTR_FROM_CHUNK(tc); + return tc? TC_PTR_FROM_CHUNK(tc) : NULL; } /* |