laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/15344 )
Change subject: gsm48_tch_rtp_create(): check against NULL mgcp_info
......................................................................
gsm48_tch_rtp_create(): check against NULL mgcp_info
osmo_mgcpc_ep_ci_get_rtp_info() might return a NULL mgcp_info, guard against
that.
Fixes: CID#203651
Change-Id: I98fe5860c49751ade1af10d99487aba259504f23
---
M src/libmsc/gsm_04_08_cc.c
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 1ec3342..e83caa2 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -1700,7 +1700,10 @@
/* Payload Type number */
mgcp_info = osmo_mgcpc_ep_ci_get_rtp_info(rtp_cn->ci);
- payload_type = map_codec_to_pt(mgcp_info->ptmap, mgcp_info->ptmap_len,
rtp_cn->codec);
+ if (mgcp_info && mgcp_info->ptmap_len)
+ payload_type = map_codec_to_pt(mgcp_info->ptmap,
mgcp_info->ptmap_len, rtp_cn->codec);
+ else
+ payload_type = rtp_cn->codec;
rtp_cn_local = call_leg_local_ip(cl, RTP_TO_CN);
if (!rtp_cn_local) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15344
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I98fe5860c49751ade1af10d99487aba259504f23
Gerrit-Change-Number: 15344
Gerrit-PatchSet: 4
Gerrit-Owner: neels <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
