From 0db0de619070c171dacdf40022011abad8a73cbc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 23 May 2006 04:36:28 +0000 Subject: r15828: a talloc steal optimisation spotted by metze (This used to be commit e00ff9f35eed28aeecdc779cee06b87c34d82124) --- source4/lib/talloc/talloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index 823ae4ffb3..67478fc9d4 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/lib/talloc/talloc.c @@ -698,7 +698,7 @@ void *talloc_steal(const void *new_ctx, const void *ptr) new_tc = talloc_chunk_from_ptr(new_ctx); - if (tc == new_tc) { + if (tc == new_tc || tc->parent == new_tc) { return discard_const_p(void, ptr); } -- cgit