File 0021-Clamp-parsed-doubles-to-float-representabl... of Package libqt5-qtsvg

Overview Repositories Revisions Requests Users Attributes Meta

File 0021-Clamp-parsed-doubles-to-float-representable-values.patch of Package libqt5-qtsvg (Revision 8a2bfe0923c457cd3a0b00a48689cc48)

Currently displaying revision 8a2bfe0923c457cd3a0b00a48689cc48 , Show latest

From 202cf31c73023ef0dd792dc19c3fe16d0f5ced88 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 4 Mar 2021 14:28:48 +0100
Subject: [PATCH 21/21] Clamp parsed doubles to float representable values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Parts of our rendering assumes incoming doubles can still be sane
floats.

Fixes: QTBUG-91507
Change-Id: I7086a121e1b5ed47695a1251ea90e774dd8f148d
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit bfd6ee0d8cf34b63d32adf10ed93daa0086b359f)
(cherry picked from commit 9311a42677db244cd1c584f27270fa73f69d90d7)
---
 src/svg/qsvghandler.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 73e8fb7..08ee781 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -672,7 +672,8 @@ static qreal toDouble(const QChar *&str)
             val = -val;
     } else {
         val = QByteArray::fromRawData(temp, pos).toDouble();
-        if (std::fpclassify(val) != FP_NORMAL)
+        // Do not tolerate values too wild to be represented normally by floats
+        if (std::fpclassify(float(val)) != FP_NORMAL)
             val = 0;
     }
     return val;
@@ -3042,6 +3043,8 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node,
         ncy = toDouble(cy);
     if (!r.isEmpty())
         nr = toDouble(r);
+    if (nr < 0.5)
+        nr = 0.5;
 
     qreal nfx = ncx;
     if (!fx.isEmpty())
-- 
2.20.1

Places

File 0021-Clamp-parsed-doubles-to-float-representable-values.patch of Package libqt5-qtsvg (Revision 8a2bfe0923c457cd3a0b00a48689cc48)

Places