diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-03-24 08:00:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:16 -0500 |
| commit | ae1ea5619b18be9c37f9647756e06718b17b88f2 (patch) | |
| tree | bdb20541c44c062cf9099b170a3cd8580d3d848e | |
| parent | a19d002ceea84b0b7350b1b3ebf181a03ac5b494 (diff) | |
| download | samba-ae1ea5619b18be9c37f9647756e06718b17b88f2.tar.gz samba-ae1ea5619b18be9c37f9647756e06718b17b88f2.tar.bz2 samba-ae1ea5619b18be9c37f9647756e06718b17b88f2.zip | |
r6033: Patch from 'lifeless' to clarify behaviour with NULL pointers.
Andrew Bartlett
(This used to be commit 48c518796797f021c9c7f319ca8cd0a0c185f64c)
| -rw-r--r-- | source4/lib/talloc/talloc.c | 3 | ||||
| -rw-r--r-- | source4/lib/talloc/talloc_guide.txt | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index 31796a247b..0d78dd8d24 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/lib/talloc/talloc.c @@ -609,7 +609,8 @@ void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *n /* move a lump of memory from one talloc context to another return the - ptr on success, or NULL if it could not be transferred + ptr on success, or NULL if it could not be transferred. + passing NULL as ptr will always return NULL with no side effects. */ void *talloc_steal(const void *new_ctx, const void *ptr) { diff --git a/source4/lib/talloc/talloc_guide.txt b/source4/lib/talloc/talloc_guide.txt index 4ab0f8eacc..aca3ab4937 100644 --- a/source4/lib/talloc/talloc_guide.txt +++ b/source4/lib/talloc/talloc_guide.txt @@ -306,6 +306,7 @@ NOTE: It is possible to produce loops in the parent/child relationship if you are not careful with talloc_steal(). No guarantees are provided as to your sanity or the safety of your data if you do this. +talloc_steal (new_ctx, NULL) will return NULL with no sideeffects. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- off_t talloc_total_size(const void *ptr); |