[svn-commits] rmudgett: branch 12 r421608 - in /branches/12: ./ main/cli.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Aug 20 17:19:41 2014
New Revision: 421608

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421608
Log:
cli.c: Fix tab completion of "module load" when MALLOC_DEBUG is enabled.

filename_completion_function() returns memory that was not allocated by
the MALLOC_DEBUG allocation tracker so the memory must be freed by
ast_std_free().
........

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

Merged revisions 421602 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/main/cli.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/cli.c?view=diff&rev=421608&r1=421607&r2=421608
==============================================================================
--- branches/12/main/cli.c (original)
+++ branches/12/main/cli.c Wed Aug 20 17:19:41 2014
@@ -239,7 +239,7 @@
 	if (c)
 		c = ast_strdup(c);
 
-	free(d);
+	ast_std_free(d);
 
 	return c;
 }