whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix compiler warnings in 32-bit builds"

bb10
Robert Löhning 2021-03-15 19:04:24 +01:00 committed by Qt CI Bot
parent a423c0d211 bc5fecf948
commit 35ca446e3b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/util/qktxhandler.cpp
View File

@ -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.