]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 167546 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 7 Jan 2009 22:21:02 +0000 (22:21 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 7 Jan 2009 22:21:02 +0000 (22:21 +0000)
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167548 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/file.c

index df7eb1f1e3339e19b4d01d4e6886aee87ae37b4f..53a8b5dca290dfe615c1845a61ad6c56d5fb7756 100644 (file)
@@ -317,7 +317,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)