Author: coreyfarrell Date: Sun Nov 2 02:01:02 2014 New Revision: 427023 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427023 Log: Fix ast_writestream leaks
Fix cleanup in __ast_play_and_record where others[x] may be leaked. This was caught where prepend != NULL && outmsg != NULL, once realfile[x] == NULL any further others[x] would be leaked. A cleanup block was also added for prepend != NULL && outmsg == NULL. 11+: Fix leak of ast_writestream recording_fs in app_voicemail:leave_voicemail. ASTERISK-24476 #close Reported by: Corey Farrell Review: https://reviewboard.asterisk.org/r/4138/ Modified: branches/1.8/main/app.c Modified: branches/1.8/main/app.c URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/app.c?view=diff&rev=427023&r1=427022&r2=427023 ============================================================================== --- branches/1.8/main/app.c (original) +++ branches/1.8/main/app.c Sun Nov 2 02:01:02 2014 @@ -1121,17 +1121,19 @@ ast_truncstream(others[x]); ast_closestream(others[x]); } - } - - if (prepend && outmsg) { + } else if (outmsg) { struct ast_filestream *realfiles[AST_MAX_FORMATS]; struct ast_frame *fr; for (x = 0; x < fmtcnt; x++) { snprintf(comment, sizeof(comment), "Opening the real file %s.%s\n", recordfile, sfmt[x]); realfiles[x] = ast_readfile(recordfile, sfmt[x], comment, O_RDONLY, 0, 0); - if (!others[x] || !realfiles[x]) { + if (!others[x]) { break; + } + if (!realfiles[x]) { + ast_closestream(others[x]); + continue; } /*!\note Same logic as above. */ if (dspsilence) { @@ -1149,7 +1151,15 @@ ast_verb(4, "Recording Format: sfmts=%s, prependfile %s, recordfile %s\n", sfmt[x], prependfile, recordfile); ast_filedelete(prependfile, sfmt[x]); } - } + } else { + for (x = 0; x < fmtcnt; x++) { + if (!others[x]) { + break; + } + ast_closestream(others[x]); + } + } + if (rfmt && ast_set_read_format(chan, rfmt)) { ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name); } -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
