commit: 37a5ee017ab4bc745fdff6626603ceb5ebbdd129 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Oct 12 19:47:56 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Oct 12 19:52:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a5ee01
dev-qt/qtsvg: backport qt6.6 fix for crash with invalid SVGs Bug: https://bugs.gentoo.org/915582 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch | 18 ++++++++++++++++++ .../{qtsvg-6.6.0.ebuild => qtsvg-6.6.0-r1.ebuild} | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch b/dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch new file mode 100644 index 000000000000..950cac7d679e --- /dev/null +++ b/dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/915582 +https://bugreports.qt.io/browse/QTBUG-117944 +https://codereview.qt-project.org/c/qt/qtsvg/+/510692 +https://github.com/qt/qtsvg/commit/effc44495a33babd4cf7a2044123f420e6b3da1c +From: Paul Olav Tvete <paul.tv...@qt.io> +Date: Tue, 10 Oct 2023 10:14:22 +0200 +Subject: [PATCH] Fix nullptr dereference with invalid SVG +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -3606,6 +3606,8 @@ void QSvgHandler::init() + + static bool detectCycles(const QSvgNode *node, QList<const QSvgUse *> active = {}) + { ++ if (Q_UNLIKELY(!node)) ++ return false; + switch (node->type()) { + case QSvgNode::DOC: + case QSvgNode::G: diff --git a/dev-qt/qtsvg/qtsvg-6.6.0.ebuild b/dev-qt/qtsvg/qtsvg-6.6.0-r1.ebuild similarity index 85% rename from dev-qt/qtsvg/qtsvg-6.6.0.ebuild rename to dev-qt/qtsvg/qtsvg-6.6.0-r1.ebuild index e1b14151f896..4ee65f5cee0e 100644 --- a/dev-qt/qtsvg/qtsvg-6.6.0.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.6.0-r1.ebuild @@ -16,3 +16,7 @@ RDEPEND=" sys-libs/zlib:= " DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-invalid-svg-crash.patch +)
