From 76a73083a41359f1b4dbdc606ccb4848a48ff79e Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 15 Apr 2009 20:17:33 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@188585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/file.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/main/file.c b/main/file.c
index ac47b2b51c..0439d03a8a 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) {
--
GitLab