From 90ad722fb294b9c8bc7bb83d507b9b47d4d09367 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 9 May 2020 16:53:27 +0200 Subject: [PATCH] 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 --- src/corelib/serialization/qxmlstream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index bbec9047955..8130cc0b5ca 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;