From 7f4354c10f626e5a1b19aa347df5ebb1e4f556b3 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 7 Mar 2018 13:50:35 -0600 Subject: res_pjproject.c: Upgrade bundled PJPROJECT to 2.7.2 Update patches included in bundled PJPROJECT for the new version. ASTERISK-27730 Change-Id: Id3c8c8ad82126846bcd9768bc3d0a18d89be8944 --- .../pjproject/patches/0070-sdp_media_fmt.patch | 19 ------------ .../pjproject/patches/0071-sdp_fmtp_attr.patch | 34 ---------------------- 2 files changed, 53 deletions(-) delete mode 100644 third-party/pjproject/patches/0070-sdp_media_fmt.patch delete mode 100644 third-party/pjproject/patches/0071-sdp_fmtp_attr.patch (limited to 'third-party/pjproject') diff --git a/third-party/pjproject/patches/0070-sdp_media_fmt.patch b/third-party/pjproject/patches/0070-sdp_media_fmt.patch deleted file mode 100644 index 0a0977d55..000000000 --- a/third-party/pjproject/patches/0070-sdp_media_fmt.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c -index a3dd80b..0a13206 100644 ---- a/pjmedia/src/pjmedia/sdp.c -+++ b/pjmedia/src/pjmedia/sdp.c -@@ -1516,11 +1516,12 @@ PJ_DEF(pj_status_t) pjmedia_sdp_validate2(const pjmedia_sdp_session *sdp, - * RTC based programs sends "null" for instant messaging! - */ - if (pj_isdigit(*m->desc.fmt[j].ptr)) { -- unsigned pt = pj_strtoul(&m->desc.fmt[j]); -+ unsigned long pt; -+ pj_status_t status = pj_strtoul3(&m->desc.fmt[j], &pt, 10); - - /* Payload type is between 0 and 127. - */ -- CHECK( pt <= 127, PJMEDIA_SDP_EINPT); -+ CHECK( status == PJ_SUCCESS && pt <= 127, PJMEDIA_SDP_EINPT); - - /* If port is not zero, then for each dynamic payload type, an - * rtpmap attribute must be specified. diff --git a/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch b/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch deleted file mode 100644 index 8228d5dd6..000000000 --- a/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c -index a3dd80b..6117e07 100644 ---- a/pjmedia/src/pjmedia/sdp.c -+++ b/pjmedia/src/pjmedia/sdp.c -@@ -256,7 +256,8 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtpmap( const pjmedia_sdp_attr *attr, - - PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "rtpmap")==0, PJ_EINVALIDOP); - -- PJ_ASSERT_RETURN(attr->value.slen != 0, PJMEDIA_SDP_EINATTR); -+ if (attr->value.slen == 0) -+ return PJMEDIA_SDP_EINATTR; - - init_sdp_parser(); - -@@ -341,6 +342,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_fmtp( const pjmedia_sdp_attr *attr, - - PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "fmtp")==0, PJ_EINVALIDOP); - -+ if (attr->value.slen == 0) -+ return PJMEDIA_SDP_EINATTR; -+ - /* fmtp BNF: - * a=fmtp: - */ -@@ -379,6 +383,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtcp(const pjmedia_sdp_attr *attr, - - PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "rtcp")==0, PJ_EINVALIDOP); - -+ if (attr->value.slen == 0) -+ return PJMEDIA_SDP_EINATTR; -+ - init_sdp_parser(); - - /* fmtp BNF: -- cgit v1.2.3