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

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jan  7 16:21:02 2009
New Revision: 167548

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

................
r167546 | russell | 2009-01-07 16:20:31 -0600 (Wed, 07 Jan 2009) | 10 lines

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

........
r167545 | russell | 2009-01-07 16:19:47 -0600 (Wed, 07 Jan 2009) | 2 lines

Only try to close the file if one was actually opened

........

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

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=167548&r1=167547&r2=167548
==============================================================================
--- branches/1.6.0/main/file.c (original)
+++ branches/1.6.0/main/file.c Wed Jan  7 16:21:02 2009
@@ -317,7 +317,8 @@
 		free(f->realfilename);
 	if (f->fmt->close)
 		f->fmt->close(f);
-	fclose(f->f);
+	if (f->f)
+		fclose(f->f);
 	if (f->vfs)
 		ast_closestream(f->vfs);
 	if (f->orig_chan_name)