diff options
| author | Joshua Colp <jcolp@digium.com> | 2018-03-13 10:38:00 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-13 10:38:00 -0500 |
| commit | 7744e8380527ea045b95e156da79a49efbd65523 (patch) | |
| tree | d3e54bbd6cc5bc7de2770d9cbe3d4039de1e722e | |
| parent | 14857195310b1f8f00c89f2b67e3a6c981d39e93 (diff) | |
| parent | 7f4354c10f626e5a1b19aa347df5ebb1e4f556b3 (diff) | |
Merge "res_pjproject.c: Upgrade bundled PJPROJECT to 2.7.2"
| -rw-r--r-- | third-party/pjproject/patches/0070-sdp_media_fmt.patch | 19 | ||||
| -rw-r--r-- | third-party/pjproject/patches/0071-sdp_fmtp_attr.patch | 34 | ||||
| -rw-r--r-- | third-party/versions.mak | 2 |
3 files changed, 1 insertions, 54 deletions
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:<format> <format specific parameter> - */ -@@ -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: diff --git a/third-party/versions.mak b/third-party/versions.mak index a90a52348..b6daf1989 100644 --- a/third-party/versions.mak +++ b/third-party/versions.mak @@ -1,2 +1,2 @@ -PJPROJECT_VERSION = 2.7.1 +PJPROJECT_VERSION = 2.7.2 |