diff options
| author | Robert Löhning <robert.loehning@qt.io> | 2021-03-15 19:04:24 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-17 11:52:51 +0000 |
| commit | a131f01b06a7216344593d5881d55c9314c6e64c (patch) | |
| tree | 934d77e524bf407037f4e35457e347d978688ce9 /src/gui | |
| parent | 1a7faeef94dcf6826c6ee564a1bfb31ebb952e56 (diff) | |
Fix compiler warnings in 32-bit builds
comparison of integers of different signs: 'unsigned int'
and 'qsizetype' (aka 'int') [-Wsign-compare]
Change-Id: Ia27f79ab4abca8b757b65ef5f1d30151842088fe
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit bc5fecf948f0038032d575d640ad4428ffbe89fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/util/qktxhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<QByteArray, QByteArray> QKtxHandler::decodeKeyValues(QByteArrayView view) c decode(qFromUnaligned<quint32>(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. |