[asterisk-commits] trunk r10410 - in /trunk: ./ app.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Fri Feb 17 18:32:10 2006
New Revision: 10410

URL: http://svn.digium.com/view/asterisk?rev=10410&view=rev
Log:
Merged revisions 10409 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r10409 | tilghman | 2006-02-17 18:17:09 -0600 (Fri, 17 Feb 2006) | 2 lines

Bug 6529 - memory leak in ast_play_and_prepend

........

Modified:
    trunk/   (props changed)
    trunk/app.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/app.c
URL: http://svn.digium.com/view/asterisk/trunk/app.c?rev=10410&r1=10409&r2=10410&view=diff
==============================================================================
--- trunk/app.c (original)
+++ trunk/app.c Fri Feb 17 18:32:10 2006
@@ -852,6 +852,7 @@
 		res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
 		if (res < 0) {
 			ast_log(LOG_WARNING, "Unable to set to linear mode, giving up\n");
+			ast_dsp_free(sildet);
 			return -1;
 		}
 	}
@@ -956,6 +957,7 @@
 	} else {
 		ast_log(LOG_WARNING, "Error creating writestream '%s', format '%s'\n", prependfile, sfmt[x]); 
 	}
+	ast_dsp_free(sildet);
 	*duration = end - start;
 #if 0
 	if (outmsg > 1) {