From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 4 Dec 2013 14:35:37 +0000 (+0100)
Subject: talloc: avoid a function call in TALLOC_FREE() if possible.
X-Git-Tag: samba-4.0.26~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51cc8768d6421737624e08fb2c5305717586cc43;p=thirdparty%2Fsamba.git

talloc: avoid a function call in TALLOC_FREE() if possible.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit b9fcfc6399eab750880ee0b9806311dd351a8ff6)
---

diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index 5d29a8d5cf0..0d47d23b2ff 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -893,7 +893,7 @@ void *_talloc_pooled_object(const void *ctx,
  *
  * @param[in]  ctx      The chunk to be freed.
  */
-#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
+#define TALLOC_FREE(ctx) do { if (ctx != NULL) { talloc_free(ctx); ctx=NULL; } } while(0)
 
 /* @} ******************************************************************/