diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-10-23 15:23:58 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-10-23 15:23:58 +0000 |
| commit | dfd3f4ef467b05eaaa6881724cc594e66f71d322 (patch) | |
| tree | e048f982aba2044d5c39ed40b13c5b5c6b0f863e /channels/chan_mgcp.c | |
| parent | f4e028a765718d3c7f06bb5256084cff6d294930 (diff) | |
chan_mgcp: Properly handle malformed media lines
This corrects a situation in which a media line was not parsed properly
and resulted in a crash.
(closes issue ASTERISK-21190)
Reported by: adomjan
Patches:
chan_mgcp.c-sscnaf_fix uploaded by adomjan (License 5448)
........
Merged revisions 401537 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 401538 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 401539 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_mgcp.c')
| -rw-r--r-- | channels/chan_mgcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index a659a2aab..84fb3b225 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1971,7 +1971,7 @@ static int process_sdp(struct mgcp_subchannel *sub, struct mgcp_request *req) char *c; char *a; char host[258]; - int len; + int len = 0; int portno; struct ast_format_cap *peercap; int peerNonCodecCapability; @@ -2001,8 +2001,8 @@ static int process_sdp(struct mgcp_subchannel *sub, struct mgcp_request *req) ast_log(LOG_WARNING, "Unable to lookup host in c= line, '%s'\n", c); return -1; } - if (sscanf(m, "audio %30d RTP/AVP %n", &portno, &len) != 1) { - ast_log(LOG_WARNING, "Unable to determine port number for RTP in '%s'\n", m); + if (sscanf(m, "audio %30d RTP/AVP %n", &portno, &len) != 1 || !len) { + ast_log(LOG_WARNING, "Malformed media stream descriptor: %s\n", m); return -1; } sin.sin_family = AF_INET; |