[asterisk-commits] tilghman: trunk r60662 - in /trunk: ./ main/file.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sat Apr  7 20:42:32 2007
New Revision: 60662

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

................
r60661 | tilghman | 2007-04-07 20:40:47 -0500 (Sat, 07 Apr 2007) | 10 lines

Merged revisions 60660 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60660 | tilghman | 2007-04-07 20:39:25 -0500 (Sat, 07 Apr 2007) | 2 lines

Bug 9486 - memory leak when opening a filestream

........

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

Modified:
    trunk/   (props changed)
    trunk/main/file.c

Propchange: trunk/
            ('branch-1.2-merged' removed)

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=60662&r1=60661&r2=60662
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Sat Apr  7 20:42:32 2007
@@ -405,10 +405,15 @@
 				s->fmt = f;
 				s->trans = NULL;
 				s->filename = NULL;
-				if (s->fmt->format < AST_FORMAT_MAX_AUDIO)
+				if (s->fmt->format < AST_FORMAT_MAX_AUDIO) {
+					if (chan->stream)
+						ast_closestream(chan->stream);
 					chan->stream = s;
-				else
+				} else {
+					if (chan->vstream)
+						ast_closestream(chan->vstream);
 					chan->vstream = s;
+				}
 				free(fn);
 				break;
 			}
@@ -820,7 +825,7 @@
 		    open_wrapper(fs) ) {
 			ast_log(LOG_WARNING, "Unable to open %s\n", fn);
 			if (fs)
-				free(fs);
+				ast_free(fs);
 			if (bfile)
 				fclose(bfile);
 			free(fn);
@@ -933,7 +938,7 @@
 					unlink(orig_fn);
 				}
 				if (fs)
-					free(fs);
+					ast_free(fs);
 			}
 			fs->trans = NULL;
 			fs->fmt = f;