diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-09 16:53:27 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 11:32:06 +0200 |
commit | 90ad722fb294b9c8bc7bb83d507b9b47d4d09367 (patch) | |
tree | bf82043d4253fbf8b870b377f21d693183bb782b /src/corelib/serialization/qxmlstream.cpp | |
parent | a4eea312ed7b020b1bb686ec1d619b4d1f85abd4 (diff) |
QXmlStreamReader: fix a qint64 -> int truncation
QIODevice::read() returns qint64, not int, and nbytesread is qint64,
too.
Pick-to: 5.15
Change-Id: I6d41c5c656336a95bb115b461282e9f247493c25
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/serialization/qxmlstream.cpp')
-rw-r--r-- | src/corelib/serialization/qxmlstream.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index bbec904795..8130cc0b5c 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -1490,8 +1490,8 @@ uint QXmlStreamReaderPrivate::getChar_helper() nbytesread = 0; if (device) { rawReadBuffer.resize(BUFFER_SIZE); - int nbytesreadOrMinus1 = device->read(rawReadBuffer.data() + nbytesread, BUFFER_SIZE - nbytesread); - nbytesread += qMax(nbytesreadOrMinus1, 0); + qint64 nbytesreadOrMinus1 = device->read(rawReadBuffer.data() + nbytesread, BUFFER_SIZE - nbytesread); + nbytesread += qMax(nbytesreadOrMinus1, qint64{0}); } else { if (nbytesread) rawReadBuffer += dataBuffer; |