summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2023-08-15 11:13:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-08-28 17:30:07 +0000
commita7544f5ae8aa2d4016c779ebccec492a8beea1dd (patch)
treefd50afad1bbadbec54e243e27b1e8545fa4ab962
parent779418b5ee30ab36a74fb76f06a82f2a6e74067e (diff)
Update Chromium
Submodule src/3rdparty 2d71c20d..cfa9a71a: * Fix for QtWebEngine crash on Windows * FIXUP: Add minimal webrtcdesktopcapture api for hangout services extension * FIXUP: Jumbo build * [Backport] CVE-2023-4078: Inappropriate implementation in Extensions (2/2) * [Backport] CVE-2023-4077: Insufficient data validation in Extensions (3/3) * [Backport] CVE-2023-4077 (2/3) and CVE-2023-4078 (1/2) * [Backport] CVE-2023-4077: Insufficient data validation in Extensions (1/3) * [Backport] Security bug 1429353 (2/2) * [Backport] Security bug 1429353 (1/2), dependency for CVE-2023-4077 and CVE-2023-4078 * [Backport] Security bug 1454544 * [Backport] Security bug 1465224 * [Backport] CVE-2023-4070: Type Confusion in V8 * [Backport] CVE-2023-4073: Out of bounds memory access in ANGLE. * [Backport] CVE-2023-4071: Heap buffer overflow in Visuals * [Backport] CVE-2023-4076: Use after free in WebRTC * [Backport] CVE-2023-4074: Use after free in Blink Task Scheduling * [Backport] CVE-2023-4068: Type Confusion in V8 * [Backport] Security bug 1464680 * [Backport] Security bug 1464682 * FIXUP: Fix build with enable_vulkan=false Task-number: QTBUG-115470 Fixes: QTBUG-115703 Change-Id: I1478381717e2189f74041c9e3b62751bdd089d45 Reviewed-by: Anu Aliyas <anu.aliyas@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit c4e1822f45a8d6a7941c908e72690fc2a578fef7) 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 55edfe57d..14d1a5775 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
Based on Chromium version: 108.0.5359.181
-Patched with security patches up to Chromium version: 115.0.5790.98
+Patched with security patches up to Chromium version: 115.0.5790.170
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 2d71c20d894b2d19ecbbd6b54901eb00e130253
+Subproject cfa9a71a9ecb29af6c46f4ca2242c2dc9600b33
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 1a2847d3f..f6115b3ad 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -931,7 +931,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "115.0.5790.98"; // FIXME: Remember to update
+ return "115.0.5790.170"; // FIXME: Remember to update
}
QT_END_NAMESPACE