diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-03-12 20:27:01 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-03-12 20:27:01 +0000 |
| commit | 5ebfa5638a1ef4be8880181ca2b39a9d553c8276 (patch) | |
| tree | eb8adb949e78e48a40c6f431ee52bd7c82b71b52 | |
| parent | b38cb44acdf936244f5e1d5752002a68488e2214 (diff) | |
Merged revisions 108086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r108086 | kpfleming | 2008-03-12 14:16:07 -0500 (Wed, 12 Mar 2008) | 6 lines
if we receive an INVITE with a Content-Length that is not a valid number, or is zero, then don't process the rest of the message body looking for an SDP
closes issue #11475
Reported by: andrebarbosa
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@108191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e5ac3b224..16bb34765 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6150,6 +6150,7 @@ static void parse_request(struct sip_request *req) static int find_sdp(struct sip_request *req) { const char *content_type; + const char *content_length; const char *search; char *boundary; unsigned int x; @@ -6157,6 +6158,20 @@ static int find_sdp(struct sip_request *req) int found_application_sdp = FALSE; int found_end_of_headers = FALSE; + content_length = get_header(req, "Content-Length"); + + if (!ast_strlen_zero(content_length)) { + if (sscanf(content_length, "%ud", &x) != 1) { + ast_log(LOG_WARNING, "Invalid Content-Length: %s\n", content_length); + return 0; + } + + /* Content-Length of zero means there can't possibly be an + SDP here, even if the Content-Type says there is */ + if (x == 0) + return 0; + } + content_type = get_header(req, "Content-Type"); /* if the body contains only SDP, this is easy */ |