From bc5fecf948f0038032d575d640ad4428ffbe89fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Mon, 15 Mar 2021 19:04:24 +0100 Subject: Fix compiler warnings in 32-bit builds comparison of integers of different signs: 'unsigned int' and 'qsizetype' (aka 'int') [-Wsign-compare] Pick-to: 6.1 Change-Id: Ia27f79ab4abca8b757b65ef5f1d30151842088fe Reviewed-by: Eirik Aavitsland --- src/gui/util/qktxhandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/util/qktxhandler.cpp') diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp index cd8ca3635e..9f4545f3af 100644 --- a/src/gui/util/qktxhandler.cpp +++ b/src/gui/util/qktxhandler.cpp @@ -148,7 +148,7 @@ QTextureFileData QKtxHandler::read() texData.setNumFaces(decode(header->numberOfFaces)); const quint32 bytesOfKeyValueData = decode(header->bytesOfKeyValueData); - if (headerSize + bytesOfKeyValueData < buf.length()) // oob check + if (headerSize + bytesOfKeyValueData < quint64(buf.length())) // oob check texData.setKeyValueMetadata( decodeKeyValues(QByteArrayView(buf.data() + headerSize, bytesOfKeyValueData))); quint32 offset = headerSize + bytesOfKeyValueData; @@ -227,7 +227,7 @@ QMap QKtxHandler::decodeKeyValues(QByteArrayView view) c decode(qFromUnaligned(view.constData() + offset)); offset += sizeof(quint32); - if (offset + keyAndValueByteSize > view.size()) + if (offset + keyAndValueByteSize > quint64(view.size())) break; // oob read // 'key' is a UTF-8 string ending with a null terminator, 'value' is the rest. -- cgit v1.2.3