mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-05-28 00:30:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

heif: fix -Wstringop-overread warning

Browse Source
This commit is contained in:
Daniel Novomeský 2025-01-08 16:45:57 +01:00
parent bb10c4bd5c
commit bda8487147
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/imageformats/heif.cpp
View File

@ -345,31 +345,31 @@ bool HEIFHandler::isSupportedBMFFType(const QByteArray &header)
}
const char *buffer = header.constData();
if (qstrncmp(buffer + 4, "ftyp", 4) == 0) {
if (qstrncmp(buffer + 8, "heic", 4) == 0) {
if (memcmp(buffer + 4, "ftyp", 4) == 0) {
if (memcmp(buffer + 8, "heic", 4) == 0) {
return true;
}
if (qstrncmp(buffer + 8, "heis", 4) == 0) {
if (memcmp(buffer + 8, "heis", 4) == 0) {
return true;
}
if (qstrncmp(buffer + 8, "heix", 4) == 0) {
if (memcmp(buffer + 8, "heix", 4) == 0) {
return true;
}
/* we want to avoid loading AVIF files via this plugin */
if (qstrncmp(buffer + 8, "mif1", 4) == 0) {
if (memcmp(buffer + 8, "mif1", 4) == 0) {
for (int offset = 16; offset <= 24; offset += 4) {
if (qstrncmp(buffer + offset, "avif", 4) == 0) {
if (memcmp(buffer + offset, "avif", 4) == 0) {
return false;
}
}
return true;
}
if (qstrncmp(buffer + 8, "mif2", 4) == 0) {
if (memcmp(buffer + 8, "mif2", 4) == 0) {
return true;
}
if (qstrncmp(buffer + 8, "msf1", 4) == 0) {
if (memcmp(buffer + 8, "msf1", 4) == 0) {
return true;
}
}
@ -384,11 +384,9 @@ bool HEIFHandler::isSupportedHEJ2(const QByteArray &header)
}
const char *buffer = header.constData();
if (qstrncmp(buffer + 4, "ftyp", 4) == 0) {
if (qstrncmp(buffer + 8, "j2ki", 4) == 0) {
if (memcmp(buffer + 4, "ftypj2ki", 8) == 0) {
return true;
}
}
return false;
}
@ -400,11 +398,9 @@ bool HEIFHandler::isSupportedAVCI(const QByteArray &header)
}
const char *buffer = header.constData();
if (qstrncmp(buffer + 4, "ftyp", 4) == 0) {
if (qstrncmp(buffer + 8, "avci", 4) == 0) {
if (memcmp(buffer + 4, "ftypavci", 8) == 0) {
return true;
}
}
return false;
}