diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-07 22:06:18 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-07 22:06:18 +0000 |
| commit | c681768a41192e91fa02274c7b0644fb7171143c (patch) | |
| tree | 939fd5b2b962cabdc33349c26ba849b2a6048baf /main/file.c | |
| parent | c785a8bb95193bac839d8bc1769420d0c855d31c (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@167543 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/file.c b/main/file.c index b4fac2e8c..df7eb1f1e 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 */ |