From 20e5aba3b9376c2b233ea595b56d0049d7bf9508 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Wed, 24 Feb 2021 10:33:31 +0100 Subject: Avoid int overflow in QImage rotate90/180/270 Fixes: QTBUG-91223 Change-Id: Ice53c80d695a5ffdf9162df84e7c9b1e43106bae Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 8daa94431341afece6beb052e6224d215f8507b7) --- src/gui/painting/qmemrotate.cpp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp index 43aeff3268..a60d373732 100644 --- a/src/gui/painting/qmemrotate.cpp +++ b/src/gui/painting/qmemrotate.cpp @@ -45,10 +45,10 @@ static const int tileSize = 32; template Q_STATIC_TEMPLATE_FUNCTION -inline void qt_memrotate90_tiled(const T *src, int w, int h, int sstride, T *dest, int dstride) +inline void qt_memrotate90_tiled(const T *src, int w, int h, int isstride, T *dest, int idstride) { - sstride /= sizeof(T); - dstride /= sizeof(T); + const qsizetype sstride = isstride / sizeof(T); + const qsizetype dstride = idstride / sizeof(T); const int pack = sizeof(quint32) / sizeof(T); const int unaligned = @@ -104,9 +104,10 @@ inline void qt_memrotate90_tiled(const T *src, int w, int h, int sstride, T *des template Q_STATIC_TEMPLATE_FUNCTION -inline void qt_memrotate90_tiled_unpacked(const T *src, int w, int h, int sstride, T *dest, - int dstride) +inline void qt_memrotate90_tiled_unpacked(const T *src, int w, int h, int isstride, T *dest, int idstride) { + const qsizetype sstride = isstride; + const qsizetype dstride = idstride; const int numTilesX = (w + tileSize - 1) / tileSize; const int numTilesY = (h + tileSize - 1) / tileSize; @@ -132,10 +133,10 @@ inline void qt_memrotate90_tiled_unpacked(const T *src, int w, int h, int sstrid template Q_STATIC_TEMPLATE_FUNCTION -inline void qt_memrotate270_tiled(const T *src, int w, int h, int sstride, T *dest, int dstride) +inline void qt_memrotate270_tiled(const T *src, int w, int h, int isstride, T *dest, int idstride) { - sstride /= sizeof(T); - dstride /= sizeof(T); + const qsizetype sstride = isstride / sizeof(T); + const qsizetype dstride = idstride / sizeof(T); const int pack = sizeof(quint32) / sizeof(T); const int unaligned = @@ -191,9 +192,10 @@ inline void qt_memrotate270_tiled(const T *src, int w, int h, int sstride, T *de template Q_STATIC_TEMPLATE_FUNCTION -inline void qt_memrotate270_tiled_unpacked(const T *src, int w, int h, int sstride, T *dest, - int dstride) +inline void qt_memrotate270_tiled_unpacked(const T *src, int w, int h, int isstride, T *dest, int idstride) { + const qsizetype sstride = isstride; + const qsizetype dstride = idstride; const int numTilesX = (w + tileSize - 1) / tileSize; const int numTilesY = (h + tileSize - 1) / tileSize; @@ -247,8 +249,11 @@ inline void qt_memrotate90_template(const quint64 *src, int w, int h, i template Q_STATIC_TEMPLATE_FUNCTION -inline void qt_memrotate180_template(const T *src, int w, int h, int sstride, T *dest, int dstride) +inline void qt_memrotate180_template(const T *src, int w, int h, int isstride, T *dest, int idstride) { + const qsizetype sstride = isstride; + const qsizetype dstride = idstride; + const char *s = (const char*)(src) + (h - 1) * sstride; for (int dy = 0; dy < h; ++dy) { T *d = reinterpret_cast((char *)(dest) + dy * dstride); -- cgit v1.2.3