[asterisk-commits] russell: branch 1.6.1 r167544 - in /branches/1.6.1: ./ main/file.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jan  7 16:07:00 2009
New Revision: 167544

URL: http://svn.digium.com/view/asterisk?view=rev&rev=167544
Log:
Merged revisions 167542 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r167542 | russell | 2009-01-07 16:05:29 -0600 (Wed, 07 Jan 2009) | 12 lines

Merged revisions 167541 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r167541 | russell | 2009-01-07 16:03:59 -0600 (Wed, 07 Jan 2009) | 4 lines

Don't use free() directly.  This caused a crash since ast_filestream is now an ao2 object.

Reported by JunK-Y on IRC, #asterisk-dev

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/file.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/file.c?view=diff&rev=167544&r1=167543&r2=167544
==============================================================================
--- branches/1.6.1/main/file.c (original)
+++ branches/1.6.1/main/file.c Wed Jan  7 16:07:00 2009
@@ -450,7 +450,7 @@
 				if (open_wrapper(s)) {
 					fclose(bfile);
 					ast_free(fn);
-					ast_free(s);
+					ast_closestream(s);
 					continue;	/* cannot run open on file */
 				}
 				if (st.st_size == 0) {