[asterisk-commits] rmudgett: branch 13 r421616 - in /branches/13: ./ main/cli.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Aug 20 17:21:43 2014
New Revision: 421616

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421616
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
........

Merged revisions 421608 from http://svn.asterisk.org/svn/asterisk/branches/12

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

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

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