summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-01-20 09:45:16 +0100
committerMattes D <github@xoft.cz>2016-01-22 23:33:18 +0100
commitf14c6d3c7e93975c5607c0173ebe97ad28ebaf2a (patch)
treed1b349de99674036adad6ed934982c8f5020da69
parentMerge pull request #2882 from LogicParrot/wolfSpread2 (diff)
downloadcuberite-f14c6d3c7e93975c5607c0173ebe97ad28ebaf2a.tar
cuberite-f14c6d3c7e93975c5607c0173ebe97ad28ebaf2a.tar.gz
cuberite-f14c6d3c7e93975c5607c0173ebe97ad28ebaf2a.tar.bz2
cuberite-f14c6d3c7e93975c5607c0173ebe97ad28ebaf2a.tar.lz
cuberite-f14c6d3c7e93975c5607c0173ebe97ad28ebaf2a.tar.xz
cuberite-f14c6d3c7e93975c5607c0173ebe97ad28ebaf2a.tar.zst
cuberite-f14c6d3c7e93975c5607c0173ebe97ad28ebaf2a.zip
-rw-r--r--src/HTTPServer/HTTPMessage.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/HTTPServer/HTTPMessage.cpp b/src/HTTPServer/HTTPMessage.cpp
index 6762a22f8..400625690 100644
--- a/src/HTTPServer/HTTPMessage.cpp
+++ b/src/HTTPServer/HTTPMessage.cpp
@@ -94,11 +94,13 @@ size_t cHTTPRequest::ParseHeaders(const char * a_Data, size_t a_Size)
{
// The first line hasn't been processed yet
size_t res = ParseRequestLine(a_Data, a_Size);
+ ASSERT((res == AString::npos) || (res <= a_Size));
if ((res == AString::npos) || (res == a_Size))
{
return res;
}
size_t res2 = m_EnvelopeParser.Parse(a_Data + res, a_Size - res);
+ ASSERT((res2 == AString::npos) || (res2 <= a_Size - res));
if (res2 == AString::npos)
{
m_IsValid = false;
@@ -110,6 +112,7 @@ size_t cHTTPRequest::ParseHeaders(const char * a_Data, size_t a_Size)
if (m_EnvelopeParser.IsInHeaders())
{
size_t res = m_EnvelopeParser.Parse(a_Data, a_Size);
+ ASSERT((res == AString::npos) || (res <= a_Size));
if (res == AString::npos)
{
m_IsValid = false;
@@ -142,8 +145,9 @@ AString cHTTPRequest::GetBareURL(void) const
size_t cHTTPRequest::ParseRequestLine(const char * a_Data, size_t a_Size)
{
+ auto inBufferSoFar = m_IncomingHeaderData.size();
m_IncomingHeaderData.append(a_Data, a_Size);
- size_t IdxEnd = m_IncomingHeaderData.size();
+ auto IdxEnd = m_IncomingHeaderData.size();
// Ignore the initial CRLFs (HTTP spec's "should")
size_t LineStart = 0;
@@ -210,7 +214,7 @@ size_t cHTTPRequest::ParseRequestLine(const char * a_Data, size_t a_Size)
}
m_Method = m_IncomingHeaderData.substr(LineStart, MethodEnd - LineStart);
m_URL = m_IncomingHeaderData.substr(MethodEnd + 1, URLEnd - MethodEnd - 1);
- return i + 1;
+ return i + 1 - inBufferSoFar;
}
} // switch (m_IncomingHeaderData[i])
} // for i - m_IncomingHeaderData[]