summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2024-02-12 17:48:44 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2024-02-14 09:10:05 +0100
commit3eda3215feff92b6ecd1d9ecc3fcffb18b22d748 (patch)
treef4179155302489d34ab5090c1b6bb984408e6e8d
parent85bfaa5274b5d47437d6e0634746f70a6646bd4e (diff)
Update Chromium
Submodule src/3rdparty e142f6610..b9e19616: * FIXUP: Bundle DevTools localization files * [Backport] CVE-2024-0808: Integer underflow in WebUI * [Backport] Security bug 1407197 (2/2) * [Backport] Security bug 1407197 (1/2) * [Backport] CVE-2024-1283: Heap buffer overflow in Skia * [Backport] CVE-2024-1284: Use after free in Mojo * [Backport] CVE-2024-1077: Use after free in Network * [Backport] CVE-2024-1060: Use after free in Canvas * [Backport] CVE-2024-1059: Use after free in WebRTC * [Backport] Security bug 1511389 (2/2) * [Backport] Security bug 1511389 (1/2) * [Backport] CVE-2024-0810: Insufficient policy enforcement in DevTools * Bundle DevTools localization files * [Backport] Security bug 1519980 * [Backport] Security bug 1515252 * [Backport] CVE-2024-0807: Use after free in WebAudio * [Backport] Security bug 1505148 * [Backport] Use raw strings for regexps in Python code. Pick-to: 6.7 Fixes: QTBUG-121844 Fixes: QTBUG-121843 Fixes: QTBUG-122188 Change-Id: I6408e04792fd3724e7d72b2f875ca359ec30aab1 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-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 002a63ce9..3ac5f1ab8 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
Based on Chromium version: 118.0.5993.220
-Patched with security patches up to Chromium version: 120.0.6099.224
+Patched with security patches up to Chromium version: 121.0.6167.160
diff --git a/src/3rdparty b/src/3rdparty
-Subproject e142f6610f4cb6faee64ffaafe8dd197df77e67
+Subproject b9e19616d8d7cfef0440870e25c162fcdcc9e9b
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index e7e952a0c..d858d0744 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -1007,7 +1007,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "120.0.6099.224"; // FIXME: Remember to update
+ return "121.0.6167.160"; // FIXME: Remember to update
}
QT_END_NAMESPACE