[svn-commits] rmudgett: branch group/issue14292 r198071 - in /team/group/issue14292: ./ main/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri May 29 14:00:24 2009
New Revision: 198071

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198071
Log:
Turn automerge back on for this step branch.

Merged revisions 198069-198070 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/group/issue14068

................
  r198069 | rmudgett | 2009-05-29 13:55:54 -0500 (Fri, 29 May 2009) | 1 line
  
  Disable automerge
................
  r198070 | rmudgett | 2009-05-29 13:56:38 -0500 (Fri, 29 May 2009) | 9 lines
  
  Merged revisions 198064 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ........
    r198064 | file | 2009-05-29 13:39:04 -0500 (Fri, 29 May 2009) | 2 lines
    
    Fix a memory leak of the write buffer when writing a file.
  ........
................

Modified:
    team/group/issue14292/   (props changed)
    team/group/issue14292/main/file.c

Propchange: team/group/issue14292/
------------------------------------------------------------------------------
--- issue14292-integrated (original)
+++ issue14292-integrated Fri May 29 14:00:24 2009
@@ -1,1 +1,1 @@
-/team/group/issue14068:1-198014
+/team/group/issue14068:1-198070

Propchange: team/group/issue14292/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 29 14:00:24 2009
@@ -1,1 +1,1 @@
-/trunk:1-198013
+/trunk:1-198069

Modified: team/group/issue14292/main/file.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/issue14292/main/file.c?view=diff&rev=198071&r1=198070&r2=198071
==============================================================================
--- team/group/issue14292/main/file.c (original)
+++ team/group/issue14292/main/file.c Fri May 29 14:00:24 2009
@@ -322,6 +322,9 @@
 		fclose(f->f);
 	if (f->vfs)
 		ast_closestream(f->vfs);
+	if (f->write_buffer) {
+		ast_free(f->write_buffer);
+	}
 	if (f->orig_chan_name)
 		free((void *) f->orig_chan_name);
 	ast_module_unref(f->fmt->module);