[neon/qt/qtsvg/Neon/unstable] debian/patches: Don't remove m_ascent/m_descent to not break private ABI.
Dmitry Shachnev
null at kde.org
Tue Jul 23 15:14:26 BST 2024
Git commit dca33549e97b42c771718a8c73866dd3d81590a8 by Dmitry Shachnev.
Committed on 21/05/2023 at 16:04.
Pushed by jriddell into branch 'Neon/unstable'.
Don't remove m_ascent/m_descent to not break private ABI.
M +4 -6 debian/patches/CVE-2023-32573.diff
https://invent.kde.org/neon/qt/qtsvg/-/commit/dca33549e97b42c771718a8c73866dd3d81590a8
diff --git a/debian/patches/CVE-2023-32573.diff b/debian/patches/CVE-2023-32573.diff
index d404804..0d33f93 100644
--- a/debian/patches/CVE-2023-32573.diff
+++ b/debian/patches/CVE-2023-32573.diff
@@ -1,4 +1,4 @@
-Description: QSvgFont: initialize used member, remove unused
+Description: QSvgFont: initialize m_unitsPerEm to fix undefined behavior
Origin: upstream, https://download.qt.io/official_releases/qt/5.15/CVE-2023-32573-qtsvg-5.15.diff
Last-Update: 2023-05-21
@@ -12,17 +12,15 @@ Last-Update: 2023-05-21
QSvgFont(qreal horizAdvX);
void setFamilyName(const QString &name);
-@@ -86,9 +87,7 @@ public:
+@@ -86,7 +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_ascent;
+ qreal m_descent;
qreal m_horizAdvX;
- QHash<QChar, QSvgGlyph> m_glyphs;
- };
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -2666,7 +2666,7 @@ static bool parseFontFaceNode(QSvgStyleP
More information about the Neon-commits
mailing list