summaryrefslogtreecommitdiff
path: root/third-party/pjproject/patches
diff options
context:
space:
mode:
authorKevin Harwell <kharwell@digium.com>2018-02-21 14:11:29 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-02-21 14:11:29 -0600
commitc166589207b9fb0639976c89e9076adc71b298b9 (patch)
treeb0728d242051d626bfa839da726db3c989b86813 /third-party/pjproject/patches
parent5458175744ba6503d23315345c5ff2f19dd8e33a (diff)
parentd3a398cf9058219445fb1c54bfa88bb0f54a2fc4 (diff)
Merge "AST-2018-002: Crash with an invalid SDP media format description"
Diffstat (limited to 'third-party/pjproject/patches')
-rw-r--r--third-party/pjproject/patches/0070-sdp_media_fmt.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/0070-sdp_media_fmt.patch b/third-party/pjproject/patches/0070-sdp_media_fmt.patch
new file mode 100644
index 000000000..0a0977d55
--- /dev/null
+++ b/third-party/pjproject/patches/0070-sdp_media_fmt.patch
@@ -0,0 +1,19 @@
+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.