diff options
author | Robert Loehning <robert.loehning@qt.io> | 2020-07-17 12:48:04 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-07-30 20:38:05 +0000 |
commit | ef24f25aee5c3d79b7f4b034ec819bd68b758828 (patch) | |
tree | 260653711f6c56e9c4b25407e9a81a497ee409f8 | |
parent | e8958c602b4590e2032a30ea8431cbf3adf517e6 (diff) | |
download | qtsvg-ef24f25aee5c3d79b7f4b034ec819bd68b758828.tar.gz |
Use qFuzzyIsNull instead of isEmpty() on QRectF
Avoids an integer overflow in QOutlineMapper
Fixes: oss-fuzz-24131
Change-Id: I77a280640df4971e440d3f8888d2e7036a1f2e6a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 21ae1e161c933ffae38d42fe8191975d5ad8ee6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/svg/qsvgtinydocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp index b1bde78..12dd979 100644 --- a/src/svg/qsvgtinydocument.cpp +++ b/src/svg/qsvgtinydocument.cpp @@ -433,7 +433,7 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect, if (source.isEmpty()) source = viewBox(); - if (source != target && !source.isEmpty()) { + if (source != target && !qFuzzyIsNull(source.width()) && !qFuzzyIsNull(source.height())) { #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) if (m_implicitViewBox || !preserveAspectRatio()) { // Code path used when no view box is set, or IgnoreAspectRatio requested |