[neon/qt/qtsvg/Neon/testing] debian/patches: drop patches

Harald Sitter null at kde.org
Tue May 18 14:20:21 BST 2021


Git commit 670184cc50d23ff59e85004ebd88a1c6810662f0 by Harald Sitter.
Committed on 18/05/2021 at 13:20.
Pushed by sitter into branch 'Neon/testing'.

drop patches

already applied on kde's qt fork

D  +0    -35   debian/patches/CVE-2021-3481.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtsvg/commit/670184cc50d23ff59e85004ebd88a1c6810662f0

diff --git a/debian/patches/CVE-2021-3481.diff b/debian/patches/CVE-2021-3481.diff
deleted file mode 100644
index a5256f8..0000000
--- a/debian/patches/CVE-2021-3481.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: clamp parsed doubles to float representable values
-Origin: upstream, commits:
- https://code.qt.io/cgit/qt/qtsvg.git/commit/?id=aceea78cc05ac8ff
- https://code.qt.io/cgit/qt/qtsvg.git/commit/?id=bfd6ee0d8cf34b63
-Last-Update: 2021-04-12
-
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -65,6 +65,7 @@
- #include "private/qmath_p.h"
- 
- #include "float.h"
-+#include <cmath>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -672,6 +673,9 @@ static qreal toDouble(const QChar *&str)
-             val = -val;
-     } else {
-         val = QByteArray::fromRawData(temp, pos).toDouble();
-+        // Do not tolerate values too wild to be represented normally by floats
-+        if (qFpClassify(float(val)) != FP_NORMAL)
-+            val = 0;
-     }
-     return val;
- 
-@@ -3043,6 +3047,8 @@ static QSvgStyleProperty *createRadialGr
-         ncy = toDouble(cy);
-     if (!r.isEmpty())
-         nr = toDouble(r);
-+    if (nr < 0.5)
-+        nr = 0.5;
- 
-     qreal nfx = ncx;
-     if (!fx.isEmpty())
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b54f1fe..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-CVE-2021-3481.diff


More information about the Neon-commits mailing list