From: Joshua Colp <jcolp@digium.com>
Date: Sat, 31 Jan 2015 16:27:41 +0000 (+0000)
Subject: res_format_attr_h264: Fix crash when determining joint capability.
X-Git-Tag: 13.3.0-rc1~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f67402a52ad2b9d17754252d8de82902c1bfc760;p=thirdparty%2Fasterisk.git

res_format_attr_h264: Fix crash when determining joint capability.

The res_format_attr_h264 module currently incorrectly attempts to
copy SPS and PPS information from the wrong attribute. This change
fixes that.

ASTERISK-24616 #close
Reported by: Yura Kocyuba

Review: https://reviewboard.asterisk.org/r/4392/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@431521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_format_attr_h264.c b/res/res_format_attr_h264.c
index f41630211c..d263a556fa 100644
--- a/res/res_format_attr_h264.c
+++ b/res/res_format_attr_h264.c
@@ -153,13 +153,13 @@ static struct ast_format *h264_getjoint(const struct ast_format *format1, const
 	if (attr1 && !ast_strlen_zero(attr1->SPS)) {
 		ast_copy_string(attr->SPS, attr1->SPS, sizeof(attr->SPS));
 	} else if (attr2 && !ast_strlen_zero(attr2->SPS)) {
-		ast_copy_string(attr->SPS, attr1->SPS, sizeof(attr->SPS));
+		ast_copy_string(attr->SPS, attr2->SPS, sizeof(attr->SPS));
 	}
 
 	if (attr1 && !ast_strlen_zero(attr1->PPS)) {
 		ast_copy_string(attr->PPS, attr1->PPS, sizeof(attr->PPS));
 	} else if (attr2 && !ast_strlen_zero(attr2->PPS)) {
-		ast_copy_string(attr->PPS, attr1->PPS, sizeof(attr->PPS));
+		ast_copy_string(attr->PPS, attr2->PPS, sizeof(attr->PPS));
 	}
 
 	return cloned;