From 3eb9bd8e4eb44df5dc1e7158de283a7f18b8930d Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 22 Dec 2008 16:10:14 +0000 Subject: [PATCH] Merged revisions 166267 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r166267 | mmichelson | 2008-12-22 10:07:59 -0600 (Mon, 22 Dec 2008) | 17 lines Fix a file playback crash and explicitly initialize values in func_timeout.c A crash was brought up on the bugtracker. The first run through valgrind was full of legitimate complaints of uninitialized values in func_timeout when setting a response timeout. These were fixed but the crash persisted. A second run through showed the real problem. The reference counting used for filestreams was incorrect because there were some missing increments when a frame was read from a format module. (closes issue #14118) Reported by: blitzrage Patches: 14118v2.patch uploaded by putnopvut (license 60) Tested by: blitzrage ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166271 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/file.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/main/file.c b/main/file.c index 4468d22761..099f229537 100644 --- a/main/file.c +++ b/main/file.c @@ -659,6 +659,10 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) goto return_failure; fr = s->fmt->read(s, &whennext); + if (fr) { + ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM); + ao2_ref(s, +1); + } if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { if (fr) ast_log(LOG_WARNING, "Failed to write frame\n"); @@ -715,6 +719,10 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) while (!whennext) { struct ast_frame *fr = s->fmt->read(s, &whennext); + if (fr) { + ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM); + ao2_ref(s, +1); + } if (!fr || ast_write(s->owner, fr)) { /* no stream or error, as above */ if (fr) ast_log(LOG_WARNING, "Failed to write frame\n");