diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-07 22:37:14 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-07 22:37:14 +0000 |
| commit | 585c063b41ee2f98fcfc3b6a0e31621cd69692cf (patch) | |
| tree | 23036461ddd184ac9be89742da88c51e8fc219fb /main | |
| parent | 12c83cc95207487321aecf0ad0c7b365d064560b (diff) | |
Merged revisions 167569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r167569 | russell | 2009-01-07 16:36:34 -0600 (Wed, 07 Jan 2009) | 10 lines
Merged revisions 167566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r167566 | russell | 2009-01-07 16:35:36 -0600 (Wed, 07 Jan 2009) | 2 lines
Fix the last couple of places where free() was improperly used directly.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@167571 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/file.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/main/file.c b/main/file.c index aeb387371..fae857ad9 100644 --- a/main/file.c +++ b/main/file.c @@ -955,11 +955,11 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons if (!bfile || (fs = get_filestream(f, bfile)) == NULL || open_wrapper(fs) ) { ast_log(LOG_WARNING, "Unable to open %s\n", fn); - if (fs) - ast_free(fs); + if (fs) { + ast_closestream(fs); + } fs = NULL; - if (bfile) - fclose(bfile); + bfile = NULL; ast_free(fn); break; } @@ -1069,9 +1069,10 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con unlink(fn); unlink(orig_fn); } - if (fs) - ast_free(fs); - fs = NULL; + if (fs) { + ast_closestream(fs); + fs = NULL; + } continue; } fs->trans = NULL; |