mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2026-02-26 16:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix assert on broken data

Browse Source 
Change the isnan test to !isfinite. This way we include infinite numbers
too as not accepted
This commit is contained in:
Albert Astals Cid
2025-11-05 18:51:20 +01:00
committed by Mirco Miranda
parent 1c6ce2437e
commit cfbeb397a8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/imageformats/xcf.cpp
View File

@ -1801,7 +1801,7 @@ bool XCFImageFormat::assignImageBytes(Layer &layer, uint i, uint j, const GimpPr
dataPtr[x + 1] = qFromBigEndian(src[x + 1]); dataPtr[x + 1] = qFromBigEndian(src[x + 1]);
dataPtr[x + 2] = qFromBigEndian(src[x + 2]); dataPtr[x + 2] = qFromBigEndian(src[x + 2]);
dataPtr[x + 3] = qfloat16(1); dataPtr[x + 3] = qfloat16(1);
if (dataPtr[x + 0].isNaN() || dataPtr[x + 1].isNaN() || dataPtr[x + 2].isNaN()) { if (!dataPtr[x + 0].isFinite() || !dataPtr[x + 1].isFinite() || !dataPtr[x + 2].isFinite()) {
return false; return false;
} }
} }
@ -1814,7 +1814,7 @@ bool XCFImageFormat::assignImageBytes(Layer &layer, uint i, uint j, const GimpPr
const qfloat16 *dataPtr = reinterpret_cast<qfloat16 *>(image.scanLine(y)); const qfloat16 *dataPtr = reinterpret_cast<qfloat16 *>(image.scanLine(y));
for (int x = 0; x < width * 4; ++x) { for (int x = 0; x < width * 4; ++x) {
if (dataPtr[x].isNaN()) { if (!dataPtr[x].isFinite()) {
return false; return false;
} }
} }
@ -1835,7 +1835,7 @@ bool XCFImageFormat::assignImageBytes(Layer &layer, uint i, uint j, const GimpPr
const float *dataPtr = reinterpret_cast<float *>(image.scanLine(y)); const float *dataPtr = reinterpret_cast<float *>(image.scanLine(y));
for (int x = 0; x < width * 4; ++x) { for (int x = 0; x < width * 4; ++x) {
if (std::isnan(dataPtr[x])) { if (!std::isfinite(dataPtr[x])) {
return false; return false;
} }
} }
@ -1850,7 +1850,7 @@ bool XCFImageFormat::assignImageBytes(Layer &layer, uint i, uint j, const GimpPr
dataPtr[x + 1] = qFromBigEndian(src[x + 1]); dataPtr[x + 1] = qFromBigEndian(src[x + 1]);
dataPtr[x + 2] = qFromBigEndian(src[x + 2]); dataPtr[x + 2] = qFromBigEndian(src[x + 2]);
dataPtr[x + 3] = 1.f; dataPtr[x + 3] = 1.f;
if (std::isnan(dataPtr[x + 0]) || std::isnan(dataPtr[x + 1]) || std::isnan(dataPtr[x + 2])) { if (!std::isfinite(dataPtr[x + 0]) || !std::isfinite(dataPtr[x + 1]) || !std::isfinite(dataPtr[x + 2])) {
return false; return false;
} }
} }