[svn-commits] mjordan: branch 10 r370274 - in /branches/10: ./ main/cel.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Jul 19 17:01:32 2012
New Revision: 370274

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370274
Log:
Fix compilation error when MALLOC_DEBUG is enabled

To fix a memory leak in CEL, a channel datastore was introduced whose
destruction function pointer was pointed to the ast_free macro.  Without
MALLOC_DEBUG enabled this compiles as fine, as ast_free is defined as free.
With MALLOC_DEBUG enabled, however, ast_free takes on a definition from a
different place then utils.h, and became undefined.  This patch resolves this
by using a reference to ast_free_ptr.  When MALLOC_DEBUG is enabled, this
calls ast_free; when MALLOC_DEBUG is not enabled, this is defined to be
ast_free, which is defined to be free.

(issue AST-916)
Reported by: Thomas Arimont
........

Merged revisions 370273 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/main/cel.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/cel.c?view=diff&rev=370274&r1=370273&r2=370274
==============================================================================
--- branches/10/main/cel.c (original)
+++ branches/10/main/cel.c Thu Jul 19 17:01:32 2012
@@ -395,7 +395,7 @@
  */
 static const struct ast_datastore_info fabricated_channel_datastore = {
 	.type = "CEL fabricated channel",
-	.destroy = ast_free,
+	.destroy = ast_free_ptr,
 };
 
 struct ast_channel *ast_cel_fabricate_channel_from_event(const struct ast_event *event)