diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-05-02 08:24:58 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-05-02 09:08:51 -0400 |
| commit | c2fb597e863fb296b5cdaf36e8b258b20c47d4a1 (patch) | |
| tree | 3c2ff37aaa78dd5ae79917a9e30f9abeff12bba2 /dev-qt | |
| parent | dev-perl/UUID: add Try-Tiny test dep (diff) | |
| download | gentoo-c2fb597e863fb296b5cdaf36e8b258b20c47d4a1.tar.gz gentoo-c2fb597e863fb296b5cdaf36e8b258b20c47d4a1.tar.bz2 gentoo-c2fb597e863fb296b5cdaf36e8b258b20c47d4a1.zip | |
dev-qt/qtbase: backport fix for CVE-2024-33861
Bug: https://bugs.gentoo.org/931096
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.7.0-CVE-2024-33861.patch | 23 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.7.0-r2.ebuild (renamed from dev-qt/qtbase/qtbase-6.7.0-r1.ebuild) | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/dev-qt/qtbase/files/qtbase-6.7.0-CVE-2024-33861.patch b/dev-qt/qtbase/files/qtbase-6.7.0-CVE-2024-33861.patch new file mode 100644 index 000000000000..0a73d721612b --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.0-CVE-2024-33861.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/931096 +https://www.qt.io/blog/security-advisory-qstringconverter +https://codereview.qt-project.org/c/qt/qtbase/+/556191 +--- a/src/corelib/text/qstringconverter.cpp ++++ b/src/corelib/text/qstringconverter.cpp +@@ -1954,7 +1954,7 @@ struct QStringConverterICU : QStringConverter + const void *context; + ucnv_getToUCallBack(icu_conv, &action, &context); + if (context != state) +- ucnv_setToUCallBack(icu_conv, action, &state, nullptr, nullptr, &err); ++ ucnv_setToUCallBack(icu_conv, action, state, nullptr, nullptr, &err); + + ucnv_toUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err); + // We did reserve enough space: +@@ -1987,7 +1987,7 @@ struct QStringConverterICU : QStringConverter + const void *context; + ucnv_getFromUCallBack(icu_conv, &action, &context); + if (context != state) +- ucnv_setFromUCallBack(icu_conv, action, &state, nullptr, nullptr, &err); ++ ucnv_setFromUCallBack(icu_conv, action, state, nullptr, nullptr, &err); + + ucnv_fromUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err); + // We did reserve enough space: diff --git a/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild index 23c59f62fc8d..203bcb3c6d6f 100644 --- a/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild @@ -141,6 +141,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch "${FILESDIR}"/${PN}-6.6.3-pkgconf-deps.patch "${FILESDIR}"/${PN}-6.7.0-qspan-ifdef.patch + "${FILESDIR}"/${PN}-6.7.0-CVE-2024-33861.patch ) src_prepare() { |