[neon/qt/qtsvg/Neon/release] debian/patches: add patch recommended by upstream
Jonathan Esk-Riddell
null at kde.org
Mon May 15 11:20:21 BST 2023
Git commit 2005cc0a5fedf1886eb2995bc5401ca9eca26bff by Jonathan Esk-Riddell.
Committed on 15/05/2023 at 10:20.
Pushed by jriddell into branch 'Neon/release'.
add patch recommended by upstream
A +34 -0 debian/patches/CVE-2023-32573-qtsvg-5.15.diff
A +1 -0 debian/patches/series
https://invent.kde.org/neon/qt/qtsvg/commit/2005cc0a5fedf1886eb2995bc5401ca9eca26bff
diff --git a/debian/patches/CVE-2023-32573-qtsvg-5.15.diff b/debian/patches/CVE-2023-32573-qtsvg-5.15.diff
new file mode 100644
index 0000000..515c364
--- /dev/null
+++ b/debian/patches/CVE-2023-32573-qtsvg-5.15.diff
@@ -0,0 +1,34 @@
+--- a/src/svg/qsvgfont_p.h
++++ b/src/svg/qsvgfont_p.h
+@@ -74,6 +74,7 @@ public:
+ class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
+ {
+ public:
++ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
+ QSvgFont(qreal horizAdvX);
+
+ void setFamilyName(const QString &name);
+@@ -86,9 +87,7 @@ public:
+ void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const;
+ public:
+ QString m_familyName;
+- qreal m_unitsPerEm;
+- qreal m_ascent;
+- qreal m_descent;
++ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
+ qreal m_horizAdvX;
+ QHash<QChar, QSvgGlyph> m_glyphs;
+ };
+
+
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
+@@ -2668,7 +2668,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent,
+
+ qreal unitsPerEm = toDouble(unitsPerEmStr);
+ if (!unitsPerEm)
+- unitsPerEm = 1000;
++ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
+
+ if (!name.isEmpty())
+ font->setFamilyName(name);
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3eee181
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+CVE-2023-32573-qtsvg-5.15.diff
More information about the Neon-commits
mailing list