mirror of https://github.com/qt/qtbase.git
Merge 4139a41f3e
into c7b3cb5f2a
This commit is contained in:
commit
f277005b5c
|
@ -9592,7 +9592,7 @@ QDataStream &operator>>(QDataStream &in, QString &str)
|
||||||
qsizetype allocated = 0;
|
qsizetype allocated = 0;
|
||||||
|
|
||||||
while (allocated < len) {
|
while (allocated < len) {
|
||||||
int blockSize = qMin(Step, len - allocated);
|
qsizetype blockSize = qMin(Step, len - allocated);
|
||||||
str.resize(allocated + blockSize);
|
str.resize(allocated + blockSize);
|
||||||
if (in.readRawData(reinterpret_cast<char *>(str.data()) + allocated * 2,
|
if (in.readRawData(reinterpret_cast<char *>(str.data()) + allocated * 2,
|
||||||
blockSize * 2) != blockSize * 2) {
|
blockSize * 2) != blockSize * 2) {
|
||||||
|
|
Loading…
Reference in New Issue