Fabian Vogt
78347edc70
- Add upstream change (boo#1211298, CVE-2023-32573): * CVE-2023-32573-qtsvg-6.5.diff OBS-URL: https://build.opensuse.org/request/show/1086201 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-svg?expand=0&rev=32
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From ff22c3ccf8ccf813fdcfda23f7740ba73ba5ce0a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehning@qt.io>
|
|
Date: Mon, 24 Apr 2023 15:27:17 +0200
|
|
Subject: [PATCH] QSvgFont: Initialize used member, remove unused
|
|
|
|
Credit to OSS-Fuzz
|
|
|
|
[ChangeLog][QtSvg] Fixed undefined behavior from using uninitialized
|
|
variable.
|
|
|
|
Pick-to: 6.5 6.2 5.15
|
|
Coverity-Id: 22618
|
|
Change-Id: Id52277bb0e2845f4d342e187dbb8093e9276b70c
|
|
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
---
|
|
src/svg/qsvgfont_p.h | 5 ++---
|
|
src/svg/qsvghandler.cpp | 2 +-
|
|
2 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h
|
|
index a7cc98b..9cf3dfe 100644
|
|
--- a/src/svg/qsvgfont_p.h
|
|
+++ b/src/svg/qsvgfont_p.h
|
|
@@ -38,6 +38,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);
|
|
@@ -50,9 +51,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;
|
|
};
|
|
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
|
|
index 29ca733..a891848 100644
|
|
--- a/src/svg/qsvghandler.cpp
|
|
+++ b/src/svg/qsvghandler.cpp
|
|
@@ -2622,7 +2622,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);
|
|
--
|
|
2.40.1
|
|
|