summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2022-08-16 17:46:48 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-19 17:32:47 +0000
commit7f3546760bf2f6eb75773b36bb779810caae5e0d (patch)
tree0d03a3268e9ae01ef788801e7bdb8d89aad680a7
parentbb9f205f151707f3eb86021b74c8e37a655b6e4c (diff)
Update Chromium
Submodule src/3rdparty 8496e134..620599a6: * 2nd fixup for [Backport] CVE-2022-2605 * Fixup for [Backport] CVE-2022-2605: Out of bounds read in Dawn (1/3) * [Backport] CVE-2022-2854: Use after free in SwiftShader * [Backport] CVE-2022-2860: Insufficient policy enforcement in Cookies * [Backport] CVE-2022-2855: Use after free in ANGLE * [Backport] CVE-2022-2857: Use after free in Blink * [Backport] CVE-2022-2853: Heap buffer overflow in Downloads * Disable accelerated_2d_canvas for Intel drivers on Windows * [Backport] CVE-2022-2605: Out of bounds read in Dawn (3/3) * [Backport] CVE-2022-2605: Out of bounds read in Dawn (2/3) * [Backport] CVE-2022-2605: Out of bounds read in Dawn (1/3) * Native spellchecker: Fix it when enabled * Fix build without spellcheck * [Backport] Security bug 1264288 * [Backport] Security bug 1333970 * [Backport] Security bug 1343889 Fixes: QTBUG-104640 Task-number: QTBUG-1053266 Change-Id: I9fec122a689bcdf0afdec482b7a60cb5f811543d Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 09799212350a54f1c8d7b204ad07a2778b0fe6d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--CHROMIUM_VERSION4
m---------src/3rdparty0
-rw-r--r--src/core/web_engine_context.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION
index 2ec45229b..f3424da5c 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
-Based on Chromium version: 94.0.4606.126
-Patched with security patches up to Chromium version: 99.0.4844.84
+Based on Chromium version: 102.0.5005.137
+Patched with security patches up to Chromium version: 104.0.5112.102
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 8496e134077ac79bb185d7d0f0333cdddb27a67
+Subproject 4c842ebb1f1901cfc80dc9e9d9bbe9dce957c59
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 3465e7fef..d380becbd 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -884,7 +884,7 @@ const char *qWebEngineChromiumVersion() noexcept
}
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "99.0.4844.84"; // FIXME: Remember to update
+ return "104.0.5112.102"; // FIXME: Remember to update
}
QT_END_NAMESPACE