aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-07 22:21:40 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-07 22:21:40 +0000
commit3387f119fbf0fc567a6ff23b8af757fdcdea21e3 (patch)
tree9759b71ada34f4fae5f6fe1eb1f2a864ec613dac /main
parent0adde69177c5882d1f894bb8b1f5fef9415d3290 (diff)
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 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@167550 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/file.c b/main/file.c
index 5663d6a8b..1556eb23a 100644
--- a/main/file.c
+++ b/main/file.c
@@ -318,7 +318,8 @@ static void filestream_destructor(void *arg)
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)