diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2024-02-07 15:08:50 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-09 13:38:14 +0000 |
| commit | 278edc41fbacd169b5ffce7cb7c91fe9a8355fe6 (patch) | |
| tree | 4cc56d9d7d7546c69fe3e52274603bb89de46491 | |
| parent | 90db5b974201b9061ec2238f9c4e89698150d118 (diff) | |
Update Chromium
Submodule src/3rdparty e257d651..707f4e7c:
* [Backport] CVE-2024-1284: Use after free in Mojo
* [Backport] CVE-2024-1283: Heap buffer overflow in Skia
* [Backport] CVE-2024-1059: Use after free in WebRTC
* Fixup: [Backport] Security bug 1407197
* [Backport] Use raw strings for regexps in Python code.
* [Backport] CVE-2024-1077: Use after free in Network
* [Backport] CVE-2024-1060: Use after free in Canvas
* [Backport] Security bug 1519980
* FIXUP: Fix build with VS Toolset 17.8
* Fix build with VS Toolset 17.8
* Remove unused python import
* [Backport] Update vendored copy of six to 1.16.0.
Pick-to: 6.5
Fixes: QTBUG-121845
Fixes: QTBUG-122095
Change-Id: Ice00b6537b19d2a7af7787b5f2989283c89130b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 8b521bfccd0ed6fe084bc0bf5b41ec04c31dc83b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index c481f19c8..76c045625 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: 121.0.6167.85 +Patched with security patches up to Chromium version: 121.0.6167.160 diff --git a/src/3rdparty b/src/3rdparty -Subproject e257d6513927fa24df48075bce9b33c4b5f546f +Subproject 707f4e7c0110c33df3d36a1942ad1b0ea2cb997 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index d3868c38d..abd065c66 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 "121.0.6167.85"; // FIXME: Remember to update + return "121.0.6167.160"; // FIXME: Remember to update } QT_END_NAMESPACE |