[asterisk-commits] russell: branch 1.6.0 r167571 - in /branches/1.6.0: ./ main/file.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jan  7 16:37:14 2009
New Revision: 167571

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

................
r167569 | russell | 2009-01-07 16:36:34 -0600 (Wed, 07 Jan 2009) | 10 lines

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

........
r167566 | russell | 2009-01-07 16:35:36 -0600 (Wed, 07 Jan 2009) | 2 lines

Fix the last couple of places where free() was improperly used directly.

........

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

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

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

Modified: branches/1.6.0/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/file.c?view=diff&rev=167571&r1=167570&r2=167571
==============================================================================
--- branches/1.6.0/main/file.c (original)
+++ branches/1.6.0/main/file.c Wed Jan  7 16:37:14 2009
@@ -955,11 +955,11 @@
 
 		if (!bfile || (fs = get_filestream(f, bfile)) == NULL || open_wrapper(fs) ) {
 			ast_log(LOG_WARNING, "Unable to open %s\n", fn);
-			if (fs)
-				ast_free(fs);
+			if (fs) {
+				ast_closestream(fs);
+			}
 			fs = NULL;
-			if (bfile)
-				fclose(bfile);
+			bfile = NULL;
 			ast_free(fn);
 			break;				
 		}
@@ -1069,9 +1069,10 @@
 					unlink(fn);
 					unlink(orig_fn);
 				}
-				if (fs)
-					ast_free(fs);
-				fs = NULL;
+				if (fs) {
+					ast_closestream(fs);
+					fs = NULL;
+				}
 				continue;
 			}
 			fs->trans = NULL;