aboutsummaryrefslogtreecommitdiffstats
path: root/res/res_convert.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-26 18:20:57 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-26 18:20:57 +0000
commitd6c1a876ae298e9749fc763c5a46d54dee20840a (patch)
treef00456206af296e541cba3f22a09b45f8b058bf3 /res/res_convert.c
parent483114938db9c910d0a8421a47ad21ec915bd22b (diff)
Merged revisions 196826 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r196826 | russell | 2009-05-26 13:14:36 -0500 (Tue, 26 May 2009) | 9 lines Resolve a file handle leak. The frames here should have always been freed. However, out of luck, there was never any memory leaked. However, after file streams became reference counted, this code would leak the file stream for the file being read. (closes issue #15181) Reported by: jkroon ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@196843 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_convert.c')
-rw-r--r--res/res_convert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_convert.c b/res/res_convert.c
index ddcd01ae1..94d6e1e59 100644
--- a/res/res_convert.c
+++ b/res/res_convert.c
@@ -117,9 +117,11 @@ static char *handle_cli_file_convert(struct ast_cli_entry *e, int cmd, struct as
while ((f = ast_readframe(fs_in))) {
if (ast_writestream(fs_out, f)) {
+ ast_frfree(f);
ast_cli(a->fd, "Failed to convert %s.%s to %s.%s!\n", name_in, ext_in, name_out, ext_out);
goto fail_out;
}
+ ast_frfree(f);
}
cost = ast_tvdiff_ms(ast_tvnow(), start);