strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ParseError on valid data

Browse source 
Change-Id: I0706030d9933313e44ae89b92b62576dacbf7e9e
This commit is contained in:
Szymon Kłos 2019-06-24 14:36:46 +02:00 committed by Michael Meeks
parent 7f6af05213
commit 610c2aaf23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/Clipboard.hpp
View file

@ -32,16 +32,19 @@ struct ClipboardData
std::string mime, hexLen, newline;
std::getline(inStream, mime, '\n');
std::getline(inStream, hexLen, '\n');
uint64_t len = strtoll( hexLen.c_str(), nullptr, 16 );
std::string content(len, ' ');
inStream.read(&content[0], len);
if (inStream.fail())
throw ParseError("error during reading the stream with length: " + hexLen);
std::getline(inStream, newline, '\n');
if (mime.length() > 0)
if (mime.length() && hexLen.length() && !inStream.fail())
{
_mimeTypes.push_back(mime);
_content.push_back(content);
uint64_t len = strtoll( hexLen.c_str(), nullptr, 16 );
std::string content(len, ' ');
inStream.read(&content[0], len);
if (inStream.fail())
throw ParseError("error during reading the stream");
std::getline(inStream, newline, '\n');
if (mime.length() > 0)
{
_mimeTypes.push_back(mime);
_content.push_back(content);
}
}
}
}