generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 18:22:59 +02:00
Code Issues Projects Releases Wiki Activity

detect malformed MIME messages earlier

Browse Source
This commit is contained in:
Guenter Obiltschnig
2017-02-12 15:44:27 +01:00
parent ab2554a7ca
commit 46cb6afea5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Net/src/MultipartReader.cpp
View File

@@ -262,11 +262,13 @@ void MultipartReader::guessBoundary()
{ {
_istr.get(); _istr.get();
ch = _istr.peek(); ch = _istr.peek();
while (ch != eof && ch != '\r' && ch != '\n') while (ch != eof && ch != '\r' && ch != '\n' && _boundary.size() < 128) // Note: should be no longer than 70 chars acc. to RFC 2046
{ {
_boundary += (char) _istr.get(); _boundary += (char) _istr.get();
ch = _istr.peek(); ch = _istr.peek();
} }
if (ch != '\r' && ch != '\n')
throw MultipartException("Invalid boundary line found");
if (ch == '\r' || ch == '\n') if (ch == '\r' || ch == '\n')
_istr.get(); _istr.get();
if (_istr.peek() == '\n') if (_istr.peek() == '\n')
@@ -288,18 +290,21 @@ void MultipartReader::parseHeader(MessageHeader& messageHeader)
bool MultipartReader::readLine(std::string& line, std::string::size_type n) bool MultipartReader::readLine(std::string& line, std::string::size_type n)
{ {
static const int eof = std::char_traits<char>::eof(); static const int eof = std::char_traits<char>::eof();
static const int maxLength = 1024;
line.clear(); line.clear();
int ch = _istr.peek(); int ch = _istr.peek();
while (ch != eof && ch != '\r' && ch != '\n') int length = 0;
while (ch != eof && ch != '\r' && ch != '\n' && length < maxLength)
{ {
ch = (char) _istr.get(); ch = (char) _istr.get();
if (line.length() < n) line += ch; if (line.length() < n) line += ch;
ch = _istr.peek(); ch = _istr.peek();
length++;
} }
if (ch != eof) _istr.get(); if (ch != eof) _istr.get();
if (ch == '\r' && _istr.peek() == '\n') _istr.get(); if (ch == '\r' && _istr.peek() == '\n') _istr.get();
return ch != eof; return ch != eof && length < maxLength;
} }