[asterisk-commits] tilghman: branch 1.6.0 r142742 - in /branches/1.6.0: ./ main/file.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Sep 12 11:30:07 2008
New Revision: 142742

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

................
r142741 | tilghman | 2008-09-12 11:29:01 -0500 (Fri, 12 Sep 2008) | 12 lines

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

........
r142740 | tilghman | 2008-09-12 11:27:32 -0500 (Fri, 12 Sep 2008) | 4 lines

Don't return a free'd pointer, when a file cannot be opened.
(closes issue #13462)
 Reported by: wackysalut

........

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

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=142742&r1=142741&r2=142742
==============================================================================
--- branches/1.6.0/main/file.c (original)
+++ branches/1.6.0/main/file.c Fri Sep 12 11:30:07 2008
@@ -917,6 +917,7 @@
 			ast_log(LOG_WARNING, "Unable to open %s\n", fn);
 			if (fs)
 				ast_free(fs);
+			fs = NULL;
 			if (bfile)
 				fclose(bfile);
 			ast_free(fn);