diff options
| author | Jiri Slachta <jiri.slachta@gmail.com> | 2019-04-09 19:16:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 19:16:57 +0200 |
| commit | 16bad9e04dcff392e9a92eea005127c06dfebd9c (patch) | |
| tree | 3360fae9bf8b8724e8d7fb0b1ffe789bda2298d8 | |
| parent | cb939d9677d6e38c428f9f297641d07611edeb04 (diff) | |
| parent | e88f00f4ad369a27e94a245984cd1b87035262d0 (diff) | |
Merge pull request #415 from micmac1/AST-2019-001-18.06
asterisk-15.x (18.06): add patch for AST-2019-001
| -rw-r--r-- | net/asterisk-15.x/Makefile | 2 | ||||
| -rw-r--r-- | net/asterisk-15.x/patches/150-AST-2019-001-15.diff | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/net/asterisk-15.x/Makefile b/net/asterisk-15.x/Makefile index cf8cbb4..67ff71e 100644 --- a/net/asterisk-15.x/Makefile +++ b/net/asterisk-15.x/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk15 PKG_VERSION:=15.3.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases diff --git a/net/asterisk-15.x/patches/150-AST-2019-001-15.diff b/net/asterisk-15.x/patches/150-AST-2019-001-15.diff new file mode 100644 index 0000000..f7a68be --- /dev/null +++ b/net/asterisk-15.x/patches/150-AST-2019-001-15.diff @@ -0,0 +1,34 @@ +From 476d60f850c75ca9142aaf783992db74efea6a49 Mon Sep 17 00:00:00 2001 +From: George Joseph <gjoseph@digium.com> +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 outgoing 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 attempted 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 +--- + +diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c +index e2067cc..7f5a859 100644 +--- a/res/res_pjsip_sdp_rtp.c ++++ b/res/res_pjsip_sdp_rtp.c +@@ -1941,7 +1941,7 @@ + } + + 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 */ |