[svn-commits] russell: trunk r167542 - in /trunk: ./ main/file.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jan  7 16:05:29 2009
New Revision: 167542

URL: http://svn.digium.com/view/asterisk?view=rev&rev=167542
Log:
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:
    trunk/   (props changed)
    trunk/main/file.c

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

Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?view=diff&rev=167542&r1=167541&r2=167542
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Wed Jan  7 16:05:29 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) {