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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142741 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/file.c b/main/file.c
index 2f17894..a9b36e7 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -916,6 +916,7 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
                        ast_log(LOG_WARNING, "Unable to open %s\n", fn);
                        if (fs)
                                ast_free(fs);
+                       fs = NULL;
                        if (bfile)
                                fclose(bfile);
                        ast_free(fn);