Merge pull request #4833 from dsemi/master

Do not try to parse request message when content-length is 0
This commit is contained in:
sledgehammer999 2016-03-04 17:26:28 -06:00
commit 3ddb1b98b3

View File

@ -81,6 +81,11 @@ RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray& data,
// Parse HTTP request message // Parse HTTP request message
if (m_request.headers.contains("content-length")) { if (m_request.headers.contains("content-length")) {
int content_length = m_request.headers["content-length"].toInt(); int content_length = m_request.headers["content-length"].toInt();
if (content_length < 0) {
qWarning() << Q_FUNC_INFO << "bad request: content-length negative";
return BadRequest;
}
if (content_length > static_cast<int>(m_maxContentLength)) { if (content_length > static_cast<int>(m_maxContentLength)) {
qWarning() << Q_FUNC_INFO << "bad request: message too long"; qWarning() << Q_FUNC_INFO << "bad request: message too long";
return BadRequest; return BadRequest;
@ -92,7 +97,7 @@ RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray& data,
return IncompleteRequest; return IncompleteRequest;
} }
if (!parseContent(content)) { if ((content_length > 0) && !parseContent(content)) {
qWarning() << Q_FUNC_INFO << "message parsing error"; qWarning() << Q_FUNC_INFO << "message parsing error";
return BadRequest; return BadRequest;
} }