Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

read all data from input QByteArray data stream at once

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-04 22:16:35 +00:00
parent 975e1d7b88
commit e424d28850
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/tools/qbytearray.cpp
View file

@ -2819,19 +2819,11 @@ QDataStream &operator>>(QDataStream &in, QByteArray &ba)
if (len == 0xffffffff) if (len == 0xffffffff)
return in; return in;
const quint32 Step = 1024 * 1024; ba.resize(len);
quint32 allocated = 0; if (in.readRawData(ba.data(), len) != len) {
ba.clear();
do { in.setStatus(QDataStream::ReadCorruptData);
int blockSize = qMin(Step, len - allocated); }
ba.resize(allocated + blockSize);
if (in.readRawData(ba.data() + allocated, blockSize) != blockSize) {
ba.clear();
in.setStatus(QDataStream::ReadPastEnd);
return in;
}
allocated += blockSize;
} while (allocated < len);
return in; return in;
} }