[asterisk-commits] russell: trunk r196843 - in /trunk: ./ res/res_convert.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue May 26 13:20:57 2009
New Revision: 196843

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

........
  r196826 | russell | 2009-05-26 13:14:36 -0500 (Tue, 26 May 2009) | 9 lines
  
  Resolve a file handle leak.
  
  The frames here should have always been freed.  However, out of luck, there was
  never any memory leaked.  However, after file streams became reference counted,
  this code would leak the file stream for the file being read.
  
  (closes issue #15181)
  Reported by: jkroon
........

Modified:
    trunk/   (props changed)
    trunk/res/res_convert.c

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

Modified: trunk/res/res_convert.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/res/res_convert.c?view=diff&rev=196843&r1=196842&r2=196843
==============================================================================
--- trunk/res/res_convert.c (original)
+++ trunk/res/res_convert.c Tue May 26 13:20:57 2009
@@ -117,9 +117,11 @@
 	
 	while ((f = ast_readframe(fs_in))) {
 		if (ast_writestream(fs_out, f)) {
+			ast_frfree(f);
 			ast_cli(a->fd, "Failed to convert %s.%s to %s.%s!\n", name_in, ext_in, name_out, ext_out);
 			goto fail_out;
 		}
+		ast_frfree(f);
 	}
 
 	cost = ast_tvdiff_ms(ast_tvnow(), start);