mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-06-03 17:08:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

xcf: Don't crash with files with unsupported layer modes

Browse Source
This commit is contained in:
Albert Astals Cid 2019-03-31 01:35:33 +01:00
parent af7a89fea7
commit bd704045e6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/imageformats/xcf.cpp
View File

@ -244,6 +244,12 @@ bool XCFImageFormat::random_table_initialized;
QVector<QRgb> XCFImageFormat::grayTable; QVector<QRgb> XCFImageFormat::grayTable;
template <typename T, size_t N>
constexpr size_t countof(T(&)[N])
{
return N;
}
const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = { const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
{true}, // NORMAL_MODE {true}, // NORMAL_MODE
{true}, // DISSOLVE_MODE {true}, // DISSOLVE_MODE
@ -709,6 +715,10 @@ bool XCFImageFormat::loadLayerProperties(QDataStream &xcf_io, Layer &layer)
case PROP_MODE: case PROP_MODE:
property >> layer.mode; property >> layer.mode;
if (layer.mode >= countof(layer_modes)) {
qWarning() << "Found layer with unsupported mode" << layer.mode << "Defaulting to mode 0";
layer.mode = 0;
}
break; break;
case PROP_TATTOO: case PROP_TATTOO: