mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2026-06-25 15:19:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

JP2: limits the maximum number of channels to the global value defined

Browse Source
This commit is contained in:
Mirco Miranda
2026-06-22 08:36:49 +02:00
parent a5c6239138
commit 18322b0659
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/imageformats/jp2.cpp
View File

@@ -186,7 +186,7 @@ public:
bool isImageValid(const opj_image_t *i) const bool isImageValid(const opj_image_t *i) const
{ {
return i && i->comps && i->numcomps > 0 && i->numcomps < 256; return i && i->comps && i->numcomps > 0 && i->numcomps <= KIF_MAX_IMAGE_CHANNELS;
} }
void enableThreads(opj_codec_t *codec) const void enableThreads(opj_codec_t *codec) const
@@ -347,11 +347,16 @@ public:
bool checkSizeLimits(qint32 width, qint32 height, qint32 nchannels) const bool checkSizeLimits(qint32 width, qint32 height, qint32 nchannels) const
{ {
if (width > JP2_MAX_IMAGE_WIDTH || height > JP2_MAX_IMAGE_HEIGHT || width < 1 || height < 1) { if (width > JP2_MAX_IMAGE_WIDTH || height > JP2_MAX_IMAGE_HEIGHT) {
qCCritical(LOG_JP2PLUGIN) << "Maximum image size is limited to" << JP2_MAX_IMAGE_WIDTH << "x" << JP2_MAX_IMAGE_HEIGHT << "pixels"; qCCritical(LOG_JP2PLUGIN) << "Maximum image size is limited to" << JP2_MAX_IMAGE_WIDTH << "x" << JP2_MAX_IMAGE_HEIGHT << "pixels";
return false; return false;
} }
if (width < 1 || height < 1) {
qCCritical(LOG_JP2PLUGIN) << "The image size" << width << "x" << height << "pixels is not valid";
return false;
}
if (qint64(width) * qint64(height) > JP2_MAX_IMAGE_PIXELS) { if (qint64(width) * qint64(height) > JP2_MAX_IMAGE_PIXELS) {
qCCritical(LOG_JP2PLUGIN) << "Maximum image size is limited to" << JP2_MAX_IMAGE_PIXELS << "pixels"; qCCritical(LOG_JP2PLUGIN) << "Maximum image size is limited to" << JP2_MAX_IMAGE_PIXELS << "pixels";
return false; return false;