diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2023-11-08 09:08:06 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-12-12 23:58:09 +0000 |
| commit | b3fa83462a789943b62524193769cfdcecd0e175 (patch) | |
| tree | d0fcfbcc181df09155ecfe15bd0c51cbfacff2eb | |
| parent | ca099fedd6a05de493148d773989c990c03fff88 (diff) | |
Fix allocation limit checking bug in jp2 handler
Checking should be disabled if the limit is set to 0.
Fixes: QTBUG-118797
Pick-to: 6.6
Change-Id: Ie5e01fb3d3b44eae957dbb66237eb7e9d13dc8b6
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 1b0f4df30263ad5cf95950f77761a9d813836927)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp index fe08995..09a1c11 100644 --- a/src/plugins/imageformats/jp2/qjp2handler.cpp +++ b/src/plugins/imageformats/jp2/qjp2handler.cpp @@ -306,7 +306,8 @@ Jpeg2000JasperReader::Jpeg2000JasperReader(QIODevice *iod, SubFormat format) #else jas_conf_clear(); #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - jas_conf_set_max_mem_usage(QImageReader::allocationLimit() * 1024 * 1024); + if (QImageReader::allocationLimit() > 0) + jas_conf_set_max_mem_usage(qsizetype(QImageReader::allocationLimit()) * 1024 * 1024); #else // 128MB seems to be enough. jas_conf_set_max_mem_usage(128 * 1024 * 1024); |