git: 986fd4e1a413 - main - graphics/qt6-svg: Import patch to fix null dereference at runtime
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 26 Nov 2023 16:17:33 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=986fd4e1a413aab152d54026fd0df8bd87b6da45
commit 986fd4e1a413aab152d54026fd0df8bd87b6da45
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-11-26 16:15:10 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-11-26 16:15:10 +0000
graphics/qt6-svg: Import patch to fix null dereference at runtime
PR: 275350
Approved by: kde (jhale)
Obtained from: https://github.com/qt/qtsvg/commit/effc44495a33babd4cf7a2044123f420e6b3da1c
---
graphics/qt6-svg/Makefile | 1 +
graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/graphics/qt6-svg/Makefile b/graphics/qt6-svg/Makefile
index 1b6c6acca233..7bbbcca0fb88 100644
--- a/graphics/qt6-svg/Makefile
+++ b/graphics/qt6-svg/Makefile
@@ -1,5 +1,6 @@
PORTNAME= svg
DISTVERSION= ${QT6_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt6-
diff --git a/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp b/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp
new file mode 100644
index 000000000000..8eb861736a32
--- /dev/null
+++ b/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp
@@ -0,0 +1,11 @@
+--- src/svg/qsvghandler.cpp.orig 2023-10-02 03:05:52 UTC
++++ src/svg/qsvghandler.cpp
+@@ -3606,6 +3606,8 @@ static bool detectCycles(const QSvgNode *node, QList<c
+
+ 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: