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

Fix Heap-buffer-overflow WRITE

Browse Source
This commit is contained in:
Mirco Miranda
2026-02-22 09:00:09 +01:00
committed by Albert Astals Cid
parent a91c7ef72f
commit 92368ca58f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/imageformats/jp2.cpp
View File

@ -253,13 +253,19 @@ public:
bool jp2ToImage(QImage *img) const bool jp2ToImage(QImage *img) const
{ {
Q_ASSERT(img->depth() == 8 * sizeof(T) || img->depth() == 32 * sizeof(T)); Q_ASSERT(img->depth() == 8 * sizeof(T) || img->depth() == 32 * sizeof(T));
for (qint32 c = 0, cc = m_jp2_image->numcomps; c < cc; ++c) { if (img->width() < 1 || img->height() < 1) {
auto cs = cc == 1 ? 1 : 4; return false;
}
auto maxChannels = qint32(img->bytesPerLine() / sizeof(T) / img->width());
for (qint32 c = 0, cc = std::min(qint32(m_jp2_image->numcomps), maxChannels); c < cc; ++c) {
auto cs = std::min(cc == 1 ? 1 : 4, maxChannels);
auto &&jc = m_jp2_image->comps[c]; auto &&jc = m_jp2_image->comps[c];
if (jc.data == nullptr) if (jc.data == nullptr) {
return false; return false;
if (qint32(jc.w) != img->width() || qint32(jc.h) != img->height()) }
if (qint32(jc.w) != img->width() || qint32(jc.h) != img->height()) {
return false; return false;
}
// discriminate between int and float (avoid complicating things by creating classes with template specializations) // discriminate between int and float (avoid complicating things by creating classes with template specializations)
if (std::numeric_limits<T>::is_integer) { if (std::numeric_limits<T>::is_integer) {