[svn-commits] file: branch 13 r431521 - /branches/13/res/res_format_attr_h264.c

[SVN commits to the Digium repositories]

Author: file
Date: Sat Jan 31 10:27:41 2015
New Revision: 431521

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431521
Log:
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/

Modified:
    branches/13/res/res_format_attr_h264.c

Modified: branches/13/res/res_format_attr_h264.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_format_attr_h264.c?view=diff&rev=431521&r1=431520&r2=431521
==============================================================================
--- branches/13/res/res_format_attr_h264.c (original)
+++ branches/13/res/res_format_attr_h264.c Sat Jan 31 10:27:41 2015
@@ -153,13 +153,13 @@
 	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;