From 8c2a49c2214b59905312f484577a0274e9481fc7 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 7 Jan 2009 22:06:18 +0000 Subject: [PATCH] Merged revisions 167542 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r167542 | russell | 2009-01-07 16:05:29 -0600 (Wed, 07 Jan 2009) | 12 lines Merged revisions 167541 via svnmerge from 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/branches/1.6.0@167543 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/file.c b/main/file.c index b4fac2e8c2..df7eb1f1e3 100644 --- a/main/file.c +++ b/main/file.c @@ -448,7 +448,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 */ } /* ok this is good for OPEN */