diff options
| author | Kevin Harwell <kharwell@digium.com> | 2018-02-21 14:11:39 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-02-21 14:11:39 -0600 |
| commit | bd549cf93644b80afc32a145048dcfbe8b9bbdfe (patch) | |
| tree | 968c68de5f25c1210e2f38dc0210c39c3eaff44f /third-party | |
| parent | c166589207b9fb0639976c89e9076adc71b298b9 (diff) | |
| parent | 880c69f00fcaebaaa107f2a4891b34ff8b2534fb (diff) | |
Merge "AST-2018-003: Crash with an invalid SDP fmtp attribute"
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/pjproject/patches/0071-sdp_fmtp_attr.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch b/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch new file mode 100644 index 000000000..8228d5dd6 --- /dev/null +++ b/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch @@ -0,0 +1,34 @@ +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: |