# HG changeset patch # User s.jodogne@gmail.com # Date 1559982600 -7200 # Node ID 8de071691d135e4929ce3b4cd9ea7a0a9c19c77f # Parent 408ffcb4038f0d0139ede57963df4130c9891f57 fix for visual studio 2008 diff -r 408ffcb4038f -r 8de071691d13 Core/HttpServer/MultipartStreamReader.cpp --- a/Core/HttpServer/MultipartStreamReader.cpp Sat Jun 08 09:11:33 2019 +0200 +++ b/Core/HttpServer/MultipartStreamReader.cpp Sat Jun 08 10:30:00 2019 +0200 @@ -192,7 +192,7 @@ } } - if (headersMatcher_.GetMatchEnd() + contentLength + 2 > corpusEnd) + if (static_cast(contentLength + 2) > std::distance(headersMatcher_.GetMatchEnd(), corpusEnd)) { break; // Not enough data available to have a full part } diff -r 408ffcb4038f -r 8de071691d13 Core/HttpServer/StringMatcher.cpp --- a/Core/HttpServer/StringMatcher.cpp Sat Jun 08 09:11:33 2019 +0200 +++ b/Core/HttpServer/StringMatcher.cpp Sat Jun 08 10:30:00 2019 +0200 @@ -137,6 +137,6 @@ const char* StringMatcher::GetPointerEnd() const { - return &GetMatchEnd()[0]; + return GetPointerBegin() + pattern_.size(); } }