gentoo auto-resync : 13:10:2023 - 00:16:09

3 files changed, 24 insertions, 1 deletions

diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 78c4be829309..9b94b4f2900f 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,3 +1,4 @@
+AUX qtsvg-6.6.0-invalid-svg-crash.patch 667 BLAKE2B 0803adb16afaea1503ae1ef90fea669b0a249eda701a26979dde27bbe043fe5663d62f3a076f2e56015fdfe8870d55d3cb57ec1fb3588ba6aaac4913199901ef SHA512 25bd322a1b8c319b61a468140061a012c8cb849f191aa70172bdf2fc9a4b4e563bd0c48f4f30bdde8ad0ad2a41aec8c8171f8554372454a05cde8bf54dcb51f1
 DIST qtsvg-5.15.10-gentoo-kde-1.tar.xz 5012 BLAKE2B 2eaab709cf165108b6f18ffd88ee7333ebbbca94500fcd426e155c4ef85670b565ed5db6a89c31e542118a4f048bb347375964e9056badd3c7ad5cabe3367d3e SHA512 2d3168540cfbb51302a3824f936c1c33a01864793a5eb56287dd0b13bd2ed3b23df3049d295fa5ecd94d453deed67542f5bcccc6071570a802cf04c1caef6138
 DIST qtsvg-5.15.11-gentoo-kde-1.tar.xz 3556 BLAKE2B 0bc3417e7519d0830700c51e211fb38fb821168aa3f88698129418ba664ef6e44f7f5b812d4aed7fb2d07584d074c1fd37df64200f8937fb30c4cffa8afcd9b9 SHA512 ba9cc55e1de3e7286e21feab28cbf8637275bb720069f4c7f79ed2296fb75ed68ba620b8cd79321103e3b245b9c778f66bf987b57d97970847733e6d23b8b700
 DIST qtsvg-everywhere-opensource-src-5.15.10.tar.xz 1889960 BLAKE2B 14ee7bbf0914e47d8fc39790ce597fca0085e6018d33878752e707a9ece567bb139bc2f1e689840d6641aa6db958240a4f97fab69e7200385ddb2ee53abc5f04 SHA512 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7
@@ -9,7 +10,7 @@ EBUILD qtsvg-5.15.10.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069
 EBUILD qtsvg-5.15.11.ebuild 502 BLAKE2B 3770fca4533790f99ba07a2cf16e41b785d6dcb7002dffcbaa4a731c0a2b0d7b18e47ab17e410503bb35f85053a6d4240e33b6b2a458b880cfbb7eb61abfe0ef SHA512 f9f7de8c4f720f7c5071806a20915ad342c4b4497d4ad691069468eb9d8bb9280254734369b0d9ba315039ca2b86a4226adfd98b1edac910d1201e7ca8751321
 EBUILD qtsvg-6.5.2.ebuild 343 BLAKE2B c926a49a98f2d4b414ef5a32fe24022078c11b607fe16f220273ff61db1628d4e7ff372e088df69053238d79937b5f04b1f6919e490a18057b6155e03f12e9a8 SHA512 7c2acebee6c2fa9e66ab4b92c09086eec72df5a184999154a511ff80fdeacd0d934159b00ef8917fc7bcd193147db5de168a41f1cb7f6851980fa2c60a7e0344
 EBUILD qtsvg-6.5.3.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
-EBUILD qtsvg-6.6.0.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
+EBUILD qtsvg-6.6.0-r1.ebuild 401 BLAKE2B 1f6b886d09e772f0d863f4fae89ec61dd4779c347903c33e9af0e667a9428970fd6d595a446e3bce9a221de0cff3fb9a52a740ba1e14302c8fdcf44a9ca8a81b SHA512 ec49689d768083792a885692a6cd012d1b23fe04f5d330c5f2ab10132ecf0cbfa17230dd9b47efdfe6acf6906ad3da48011726a73fb9183f0fc87acdc929cda4
 EBUILD qtsvg-6.6.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
 EBUILD qtsvg-6.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
 MISC metadata.xml 530 BLAKE2B 4cff37d5824321054b8131fc65a4a86433a2e33882c66411b7af25c0550ad4933a680ceb517d1ba2cd11dab4b3110da69f330f334d25577310d59d7ab4aca439 SHA512 f538df6a65076e6744ab7e498778ff1addd3f45af50708d5af3c0eefb5862fc0b82bf99c18b268bb6ed257b3feed51f64ed18cd4006ba717c03be37ea5258ab3
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.tvete@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
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
+)