kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "AST-2018-003: Crash with an invalid SDP fmtp attribute"

Browse Source
This commit is contained in:
Kevin Harwell
2018-02-21 14:11:39 -06:00
committed by Gerrit Code Review
parent c166589207 880c69f00f
commit bd549cf936
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
third-party/pjproject/patches/0071-sdp_fmtp_attr.patch vendored Normal file
View File

@@ -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: