kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

main/file.c: fix possible extra ast_module_unref to format modules.

Browse Source 
fn_wrapper only adds a reference to the format's module if the file
was able to be opened.  If not this causes an unmatched
ast_module_unref in filestream_destructor.  Move ast_module_ref to
get_stream.

ASTERISK-24492 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4149/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@427464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2014-11-06 12:10:36 +00:00
parent e9f3480121
commit 8745e12323
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/file.c
View File

@@ -371,6 +371,7 @@ static struct ast_filestream *get_filestream(struct ast_format_def *fmt, FILE *b
int l = sizeof(*s) + fmt->buf_size + fmt->desc_size; /* total allocation size */
if ( (s = ao2_alloc(l, filestream_destructor)) == NULL)
return NULL;
ast_module_ref(fmt->module);
s->fmt = fmt;
s->f = bfile;
@@ -399,8 +400,7 @@ static int fn_wrapper(struct ast_filestream *s, const char *comment, enum wrap_f
else if (mode == WRAP_REWRITE && f->rewrite && f->rewrite(s, comment))
ast_log(LOG_WARNING, "Unable to rewrite format %s\n", f->name);
else {
/* preliminary checks succeed. update usecount */
ast_module_ref(f->module);
/* preliminary checks succeed. */
ret = 0;
}
return ret;