From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 15 Apr 2009 20:04:20 +0000 (+0000)
Subject: Update ast_readvideo_callback to match ast_readaudio_callback.
X-Git-Tag: 1.4.25-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=730f2882d3fcf52c0a0fd3d7d19e038c88ea472b;p=thirdparty%2Fasterisk.git

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/branches/1.4@188582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/file.c b/main/file.c
index 8e83880141..8614a6def5 100644
--- a/main/file.c
+++ b/main/file.c
@@ -798,12 +798,21 @@ 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_write(s->owner, fr)) { /* no stream or error, as above */
-			if (fr)
+		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");
+				ast_frfree(fr);
+			}
 			s->owner->vstreamid = -1;
 			return FSREAD_FAILURE;
 		}
+		if (fr) {
+			ast_frfree(fr);
+		}
 	}
 
 	if (whennext != s->lasttimeout) {