Merged revisions 108191 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r108191 | kpfleming | 2008-03-12 15:27:01 -0500 (Wed, 12 Mar 2008) | 14 lines

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/branches/1.6.0@108205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-03-12 20:29:50 +00:00
parent 45de934e14
commit 3592c06d29

View File

@@ -6146,6 +6146,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;
@@ -6153,6 +6154,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 */