aboutsummaryrefslogtreecommitdiffstats
path: root/main/file.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-12 16:30:48 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-12 16:30:48 +0000
commitdb98293867bcf4ddda0dff835374d6316e045fe4 (patch)
tree88713735164d8855be020bd6d4b62be1c9d0e818 /main/file.c
parent89d5bf8e0550eea985e6110ddce5a21923c4a1a6 (diff)
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 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@142743 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
-rw-r--r--main/file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c
index 2f1789481..a9b36e7f5 100644
--- 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);