<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8483">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjproject.c: Upgrade bundled PJPROJECT to 2.7.2<br><br>Update patches included in bundled PJPROJECT for the new version.<br><br>ASTERISK-27730<br><br>Change-Id: Id3c8c8ad82126846bcd9768bc3d0a18d89be8944<br>---<br>D third-party/pjproject/patches/0070-sdp_media_fmt.patch<br>D third-party/pjproject/patches/0071-sdp_fmtp_attr.patch<br>M third-party/versions.mak<br>3 files changed, 1 insertion(+), 54 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/third-party/pjproject/patches/0070-sdp_media_fmt.patch b/third-party/pjproject/patches/0070-sdp_media_fmt.patch<br>deleted file mode 100644<br>index 0a0977d..0000000<br>--- a/third-party/pjproject/patches/0070-sdp_media_fmt.patch<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c<br>-index a3dd80b..0a13206 100644<br>---- a/pjmedia/src/pjmedia/sdp.c<br>-+++ b/pjmedia/src/pjmedia/sdp.c<br>-@@ -1516,11 +1516,12 @@ PJ_DEF(pj_status_t) pjmedia_sdp_validate2(const pjmedia_sdp_session *sdp,<br>-       * RTC based programs sends "null" for instant messaging!<br>-           */<br>-          if (pj_isdigit(*m->desc.fmt[j].ptr)) {<br>--               unsigned pt = pj_strtoul(&m->desc.fmt[j]);<br>-+           unsigned long pt;<br>-+           pj_status_t status = pj_strtoul3(&m->desc.fmt[j], &pt, 10);<br>- <br>-           /* Payload type is between 0 and 127. <br>-                */<br>--         CHECK( pt <= 127, PJMEDIA_SDP_EINPT);<br>-+            CHECK( status == PJ_SUCCESS && pt <= 127, PJMEDIA_SDP_EINPT);<br>- <br>-                 /* If port is not zero, then for each dynamic payload type, an<br>-                * rtpmap attribute must be specified.<br>diff --git a/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch b/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch<br>deleted file mode 100644<br>index 8228d5d..0000000<br>--- a/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch<br>+++ /dev/null<br>@@ -1,34 +0,0 @@<br>-diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c<br>-index a3dd80b..6117e07 100644<br>---- a/pjmedia/src/pjmedia/sdp.c<br>-+++ b/pjmedia/src/pjmedia/sdp.c<br>-@@ -256,7 +256,8 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtpmap( const pjmedia_sdp_attr *attr,<br>- <br>-     PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "rtpmap")==0, PJ_EINVALIDOP);<br>- <br>--    PJ_ASSERT_RETURN(attr->value.slen != 0, PJMEDIA_SDP_EINATTR);<br>-+    if (attr->value.slen == 0)<br>-+        return PJMEDIA_SDP_EINATTR;<br>- <br>-     init_sdp_parser();<br>- <br>-@@ -341,6 +342,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_fmtp( const pjmedia_sdp_attr *attr,<br>- <br>-     PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "fmtp")==0, PJ_EINVALIDOP);<br>- <br>-+    if (attr->value.slen == 0)<br>-+        return PJMEDIA_SDP_EINATTR;<br>-+<br>-     /* fmtp BNF:<br>-      *  a=fmtp:<format> <format specific parameter><br>-      */<br>-@@ -379,6 +383,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtcp(const pjmedia_sdp_attr *attr,<br>- <br>-     PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "rtcp")==0, PJ_EINVALIDOP);<br>- <br>-+    if (attr->value.slen == 0)<br>-+        return PJMEDIA_SDP_EINATTR;<br>-+<br>-     init_sdp_parser();<br>- <br>-     /* fmtp BNF:<br>diff --git a/third-party/versions.mak b/third-party/versions.mak<br>index a90a523..b6daf19 100644<br>--- a/third-party/versions.mak<br>+++ b/third-party/versions.mak<br>@@ -1,2 +1,2 @@<br> <br>-PJPROJECT_VERSION = 2.7.1<br>+PJPROJECT_VERSION = 2.7.2<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8483">change 8483</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8483"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id3c8c8ad82126846bcd9768bc3d0a18d89be8944 </div>
<div style="display:none"> Gerrit-Change-Number: 8483 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>