[asterisk-commits] russell: trunk r99188 - in /trunk: ./ main/slinfactory.c

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jan 19 04:06:02 2008
New Revision: 99188

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99188
Log:
Merged revisions 99187 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99187 | russell | 2008-01-19 04:05:27 -0600 (Sat, 19 Jan 2008) | 4 lines

Fix a couple of memory leaks with frame handling.  Specifically,
ast_frame_free() needed to be called on the frame that came from the translator
to signed linear.

........

Modified:
    trunk/   (props changed)
    trunk/main/slinfactory.c

Change Statistics:
 trunk/main/slinfactory.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

Modified: trunk/main/slinfactory.c
URL: http://svn.digium.com/view/asterisk/trunk/main/slinfactory.c?view=diff&rev=99188&r1=99187&r2=99188
==============================================================================
--- trunk/main/slinfactory.c (original)
+++ trunk/main/slinfactory.c Sat Jan 19 04:06:02 2008
@@ -61,6 +61,7 @@
 			ast_translator_free_path(sf->trans);
 			sf->trans = NULL;
 		}
+
 		if (!sf->trans) {
 			if (!(sf->trans = ast_translator_build_path(AST_FORMAT_SLINEAR, f->subclass))) {
 				ast_log(LOG_WARNING, "Cannot build a path from %s to slin\n", ast_getformatname(f->subclass));
@@ -68,7 +69,15 @@
 			}
 			sf->format = f->subclass;
 		}
-		if (!(begin_frame = ast_translate(sf->trans, f, 0)) || !(duped_frame = ast_frdup(begin_frame)))
+
+		if (!(begin_frame = ast_translate(sf->trans, f, 0))) 
+			return 0;
+		
+		duped_frame = ast_frdup(begin_frame);
+
+		ast_frfree(begin_frame);
+
+		if (!duped_frame)
 			return 0;
 	} else {
 		if (sf->trans) {