[asterisk-commits] coreyfarrell: branch 13 r427466 - in /branches/13: ./ main/file.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Thu Nov  6 06:13:56 2014
New Revision: 427466

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427466
Log:
main/file.c: fix possible extra ast_module_unref to format modules.

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/
........

Merged revisions 427464 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 427465 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    branches/13/   (props changed)
    branches/13/main/file.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/file.c?view=diff&rev=427466&r1=427465&r2=427466
==============================================================================
--- branches/13/main/file.c (original)
+++ branches/13/main/file.c Thu Nov  6 06:13:56 2014
@@ -435,6 +435,7 @@
 	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;
 
@@ -472,8 +473,7 @@
 	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;