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

Merged revisions 166267 via svnmerge from

Browse Source 
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
This commit is contained in:
Mark Michelson
2008-12-22 16:10:14 +00:00
parent e6a7286d11
commit 3eb9bd8e4e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/file.c
View File

@@ -659,6 +659,10 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s)
goto return_failure; goto return_failure;
fr = s->fmt->read(s, &whennext); 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 /* stream complete */ || ast_write(s->owner, fr) /* error writing */) {
if (fr) if (fr)
ast_log(LOG_WARNING, "Failed to write frame\n"); 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) { while (!whennext) {
struct ast_frame *fr = s->fmt->read(s, &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_write(s->owner, fr)) { /* no stream or error, as above */
if (fr) if (fr)
ast_log(LOG_WARNING, "Failed to write frame\n"); ast_log(LOG_WARNING, "Failed to write frame\n");