From 00f0868c363ae5e14bc72dcdf48e9d939dd5045a Mon Sep 17 00:00:00 2001 From: George Joseph Date: Wed, 30 Jan 2019 12:25:55 -0700 Subject: [PATCH] res_pjsip_sdp_rtp: Fix return code from apply_negotiated_sdp_stream apply_negotiated_sdp_stream was returning a "1" when no joint capabilities were found on an outdoing call instead of a "-1". This indicated to res_pjsip_session that the handler DID handle the sdp when in fact it didn't. Without the appropriate setup, a subsequent media frame coming in would have an invalid stream_num and cause a seg fault when the stream was atempted to be retrieved. apply_negotiated_sdp_stream now returns the correct "-1" and any media is now discarded before it reaches the core stream processing. ASTERISK-28620 Reported by: Sotiris Ganouris Change-Id: Ia095cb16b4862f2f6ad6d2d2a77453fa2542371f --- res/res_pjsip_sdp_rtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index c2b7d67037..19070c4dbb 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -1945,7 +1945,7 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session, } if (set_caps(session, session_media, session_media_transport, remote_stream, 0, asterisk_stream)) { - return 1; + return -1; } /* Set the channel uniqueid on the RTP instance now that it is becoming active */ -- 2.20.1