Merged revisions 167541 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 7 Jan 2009 22:05:29 +0000 (22:05 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 7 Jan 2009 22:05:29 +0000 (22:05 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r167541 | russell | 2009-01-07 16:03:59 -0600 (Wed, 07 Jan 2009) | 4 lines

Don't use free() directly.  This caused a crash since ast_filestream is now an ao2 object.

Reported by JunK-Y on IRC, #asterisk-dev

........

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

main/file.c

index aee9646..c0bc758 100644 (file)
@@ -450,7 +450,7 @@ static int ast_filehelper(const char *filename, const void *arg2, const char *fm
                                if (open_wrapper(s)) {
                                        fclose(bfile);
                                        ast_free(fn);
-                                       ast_free(s);
+                                       ast_closestream(s);
                                        continue;       /* cannot run open on file */
                                }
                                if (st.st_size == 0) {