summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2024-01-30 18:31:28 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2024-02-02 15:40:47 +0000
commitedf286f39d6fae7db53484d7c4b521f03129a054 (patch)
tree9568dbc960e53c2491ce7e0250df82eab64d32f4
parentfb8b5abb4cf6859323e4eef9e3c00b301d8ce7d0 (diff)
Update Chromium
Submodule src/3rdparty 7b40abeb..e257d651: * [Backport] Security bug 1407197 (2/2) * [Backport] Security bug 1407197 (1/2) * [Backport] CVE-2024-0810: Insufficient policy enforcement in DevTools * [Backport] Security bug 1511389 (2/2) * [Backport] Dependency for security bug 1511389 (1/1) * [Backport] Security bug 1511389 (1/2) * [Backport] CVE-2024-0807: Use after free in WebAudio * [Backport] CVE-2024-0808: Integer underflow in WebUI Task-number: QTBUG-121685 Change-Id: Ie8e7a70265b142b65cea5bd89c9afa45fb0dec6c Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 935caecbbff5ac79d2c43d6bdcd81fe7d83baedf)
-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 1124c6f9c..c481f19c8 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: 120.0.6099.225
+Patched with security patches up to Chromium version: 121.0.6167.85
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 7b40abebdec3e2931c88010fedc96c49fbba173
+Subproject e257d6513927fa24df48075bce9b33c4b5f546f
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 4f9bc8a67..d3868c38d 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -982,7 +982,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "120.0.6099.225"; // FIXME: Remember to update
+ return "121.0.6167.85"; // FIXME: Remember to update
}
QT_END_NAMESPACE