summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2023-10-30 11:39:06 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-10-31 02:27:02 +0000
commitcedfa5ed164ef868754438002db2558543de5cf0 (patch)
tree6845f4f3935d14745cbd1a8ad02fb011ab4319da
parent82bd69dffe10e5d894f2211167647e18b2f3050a (diff)
Update Chromium
Submodule src/3rdparty 75a9a538..8146bf85: * [Backport] CVE-2023-5218: Use after free in Site Isolation * [Backport] CVE-2023-5476: Use after free in Blink History * [Backport] CVE-2023-5486: Inappropriate implementation in Input * [Backport] Dependency for CVE-2023-5486: Inappropriate implementation in Input * [Backport] CVE-2023-5474: Heap buffer overflow in PDF * [Backport] CVE-2023-5475: Inappropriate implementation in DevTools * [Backport] CVE-2023-5484: Inappropriate implementation in Navigation * [Backport] CVE-2023-5487: Inappropriate implementation in Fullscreen * [Backport] Security bug 1472368 * [Backport] Security bug 1472365 and 1472366 * [Backport] Security bug 1486316 * Add shorter include paths workaround Task-number: QTBUG-118480 Change-Id: I8968b249bdea9e234c925cbdacf50d92d5c2f4c6 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit d40ba15ec9cbc2e3c86d2cdf35aec6abd1d2a405) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--CHROMIUM_VERSION2
m---------src/3rdparty0
-rw-r--r--src/core/web_engine_context.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION
index 19f3aa7a6..cbdb9d3bd 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
Based on Chromium version: 112.0.5615.213
-Patched with security patches up to Chromium version: 117.0.5938.149
+Patched with security patches up to Chromium version: 118.0.5993.117
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 75a9a5388ffe90c81e037ee19b2b28801e3a015
+Subproject 8146bf8543363d4c48cbaf854909abccf84de02
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index ddef165e8..5fe406415 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -965,7 +965,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "117.0.5938.149"; // FIXME: Remember to update
+ return "118.0.5993.117"; // FIXME: Remember to update
}
QT_END_NAMESPACE