flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Rewritten HTTPServer to use size_t for data lengths.

Browse Source
This commit is contained in:
madmaxoft
2014-04-01 16:36:00 +02:00
parent 0d916a3e2f
commit 1795cca552
16 changed files with 97 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/HTTPServer/MultipartParser.cpp
View File

@@ -97,8 +97,6 @@ cMultipartParser::cMultipartParser(const AString & a_ContentType, cCallbacks & a
m_EnvelopeParser(*this),
m_HasHadData(false)
{
static AString s_Multipart = "multipart/";
// Check that the content type is multipart:
AString ContentType(a_ContentType);
if (strncmp(ContentType.c_str(), "multipart/", 10) != 0)
@@ -146,7 +144,7 @@ cMultipartParser::cMultipartParser(const AString & a_ContentType, cCallbacks & a
void cMultipartParser::Parse(const char * a_Data, int a_Size)
void cMultipartParser::Parse(const char * a_Data, size_t a_Size)
{
// Skip parsing if invalid
if (!m_IsValid)
@@ -160,8 +158,8 @@ void cMultipartParser::Parse(const char * a_Data, int a_Size)
{
if (m_EnvelopeParser.IsInHeaders())
{
int BytesConsumed = m_EnvelopeParser.Parse(m_IncomingData.data(), m_IncomingData.size());
if (BytesConsumed < 0)
size_t BytesConsumed = m_EnvelopeParser.Parse(m_IncomingData.data(), m_IncomingData.size());
if (BytesConsumed == AString::npos)
{
m_IsValid = false;
return;