summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2024-01-18 22:31:55 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2024-01-19 09:56:47 +0100
commitc674260f7d3bf9295e6310f3b5de528f7364630b (patch)
tree6df3f51907d46f3f0fdb5f619895bdb9662a6f09
parent37d6cd62dc85d85137245baacfc39884f12efc8d (diff)
Update Chromium
Submodule src/3rdparty 38bef0c..7b40abeb: * [Backport] Security bug 1506535 * [Backport] CVE-2024-0518: Type Confusion in V8 * [Backport] CVE-2024-0519: Out of bounds memory access in V8 * Fix compilation without webrtc * Speculative fix for jumbo builds on windows Fixes: QTBUG-121229 Change-Id: I106c80206bc84c592d2fe1df770c391883d587df Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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 022f5fcd0..1124c6f9c 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.216
+Patched with security patches up to Chromium version: 120.0.6099.225
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 38bef0cb5eb91b6e1eb979b7b669b86dbe050c4
+Subproject 7b40abebdec3e2931c88010fedc96c49fbba173
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index a37262f8b..4f9bc8a67 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.216"; // FIXME: Remember to update
+ return "120.0.6099.225"; // FIXME: Remember to update
}
QT_END_NAMESPACE