diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-15 20:20:23 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-15 20:20:23 +0000 |
| commit | 7f1b7df4671116991bfbd28e8dcf049097af0708 (patch) | |
| tree | 195c83fc0bae02eef9b60bea913a930f66b39834 | |
| parent | ad79e5c1b20f4d890d910eb753d1f87bfb22bd83 (diff) | |
Merged revisions 188585 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r188585 | mmichelson | 2009-04-15 15:17:33 -0500 (Wed, 15 Apr 2009) | 13 lines
Merged revisions 188582 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r188582 | mmichelson | 2009-04-15 15:04:20 -0500 (Wed, 15 Apr 2009) | 7 lines
Update ast_readvideo_callback to match ast_readaudio_callback.
This fixes potential refcount errors that may occur on ast_filestreams.
AST-208
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@188596 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/file.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/main/file.c b/main/file.c index e187843b7..0def23c0b 100644 --- a/main/file.c +++ b/main/file.c @@ -778,12 +778,17 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) 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) + if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { + if (fr) { ast_log(LOG_WARNING, "Failed to write frame\n"); + ast_frfree(fr); + } s->owner->vstreamid = -1; return FSREAD_FAILURE; } + if (fr) { + ast_frfree(fr); + } } if (whennext != s->lasttimeout) { |