diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-12 16:30:07 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-12 16:30:07 +0000 |
| commit | 09948db7fe0bea33734472135084b9c371db764a (patch) | |
| tree | 174d56c8f9fac056e563c81cfd96841064cfa1de /main/file.c | |
| parent | a6734b24be9b5e0e2985475e2d2c3ec77677def9 (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.0@142742 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c index ca38d187d..e88279a6f 100644 --- a/main/file.c +++ b/main/file.c @@ -917,6 +917,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); |