Merge pull request signalwire#411 from signalwire/sdp_crash

andywolk · web-flow · commit cf0e81c75859 · 2020-02-25T02:00:01.000+04:00
[Core] Fix crash when parsing some uncommon SDP attributes
diff --git a/src/switch_core_media.c b/src/switch_core_media.c
@@ -5977,7 +5977,9 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 				}
 			}
 
-			t_engine->cur_payload_map = red_pmap;
+			if (red_pmap) {
+				t_engine->cur_payload_map = red_pmap;
+			}
 
 			for (attr = m->m_attributes; attr; attr = attr->a_next) {
 				if (!strcasecmp(attr->a_name, "rtcp") && attr->a_value) {

Original file line number	Diff line number	Diff line change
`@@ -5977,7 +5977,9 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s`
`5977`	`5977`	`}`
`5978`	`5978`	`}`
`5979`	`5979`
`5980`		`- t_engine->cur_payload_map = red_pmap;`
	`5980`	`+ if (red_pmap) {`
	`5981`	`+ t_engine->cur_payload_map = red_pmap;`
	`5982`	`+ }`
`5981`	`5983`
`5982`	`5984`	`for (attr = m->m_attributes; attr; attr = attr->a_next) {`
`5983`	`5985`	`if (!strcasecmp(attr->a_name, "rtcp") && attr->a_value) {`