mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2026-02-21 23:43:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

PSD: minor fixes while reading Image resource Section

Browse Source
This commit is contained in:
Mirco Miranda
2025-11-03 08:27:17 +01:00
parent 3d9f1c4e9e
commit 1c6ce2437e
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/imageformats/psd.cpp
View File

@ -327,14 +327,15 @@ static PSDImageResourceSection readImageResourceSection(QDataStream &s, bool *ok
*ok = true; *ok = true;
// Section size // Section size
qint32 sectioSize; quint32 tmpSize;
s >> sectioSize; s >> tmpSize;
qint64 sectioSize = tmpSize;
// Reading Image resource block // Reading Image resource block
for (auto size = sectioSize; size > 0;) { for (auto size = sectioSize; size > 0;) {
#define DEC_SIZE(value) \ #define DEC_SIZE(value) \
if ((size -= (value)) < 0) { \ if ((size -= qint64(value)) < 0) { \
*ok = false; \ *ok = false; \
break; } break; }
@ -377,15 +378,21 @@ static PSDImageResourceSection readImageResourceSection(QDataStream &s, bool *ok
quint32 dataSize; quint32 dataSize;
s >> dataSize; s >> dataSize;
DEC_SIZE(sizeof(dataSize)) DEC_SIZE(sizeof(dataSize))
// NOTE: Qt device::read() and QDataStream::readRawData() could read less data than specified. if (auto dev = s.device()) {
// The read code should be improved. if (dataSize > size) {
if (auto dev = s.device()) qCDebug(LOG_PSDPLUGIN) << "Invalid Image Resource Block Data Size!";
*ok = false;
break;
}
// NOTE: Qt device::read() and QDataStream::readRawData() could read less data than specified.
// The read code should be improved.
irb.data = dev->read(dataSize); irb.data = dev->read(dataSize);
}
auto read = irb.data.size(); auto read = irb.data.size();
if (read > 0) { if (read > 0) {
DEC_SIZE(read) DEC_SIZE(read)
} }
if (quint32(read) != dataSize) { if (read != qint64(dataSize)) {
qCDebug(LOG_PSDPLUGIN) << "Image Resource Block Read Error!"; qCDebug(LOG_PSDPLUGIN) << "Image Resource Block Read Error!";
*ok = false; *ok = false;
break; break;
@ -714,7 +721,7 @@ static bool IsValid(const PSDHeader &header)
qCDebug(LOG_PSDPLUGIN) << "PSD header: invalid number of channels" << header.channel_count; qCDebug(LOG_PSDPLUGIN) << "PSD header: invalid number of channels" << header.channel_count;
return false; return false;
} }
if (header.width > std::min(300000, PSD_MAX_IMAGE_WIDTH) || header.height > std::min(300000, PSD_MAX_IMAGE_HEIGHT)) { if (header.width > uint(std::min(300000, PSD_MAX_IMAGE_WIDTH)) || header.height > uint(std::min(300000, PSD_MAX_IMAGE_HEIGHT))) {
qCDebug(LOG_PSDPLUGIN) << "PSD header: invalid image size" << header.width << "x" << header.height; qCDebug(LOG_PSDPLUGIN) << "PSD header: invalid image size" << header.width << "x" << header.height;
return false; return false;
} }