diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2024-01-26 12:48:56 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2024-01-31 13:56:24 +0100 |
| commit | 6015aca44fe96285fb79ef11559378bc2139e803 (patch) | |
| tree | cd7c0ee6bef86fdcdf83475eb78f0cc2d73fedf0 | |
| parent | 9d5f94b7f4b954bbe7e261d184420e237c704557 (diff) | |
Update Chromium
Submodule src/3rdparty 97af90e4..e142f661:
* FIXUP: Fix build with VS Toolset 17.8
* [Backport] Update vendored copy of six to 1.16.0.
* Fix build with VS Toolset 17.8
* [Backport] Security bug 1506535
* [Backport] CVE-2024-0519: Out of bounds memory access in V8
* [Backport] CVE-2024-0518: Type Confusion in V8
* [Backport] CVE-2024-0517: Out of bounds write in V8
* Accept system_libdir with mulit-paths for pkg-config.py
* [Backport] renderergl_utils: check strings from glGetString for nullptr
Pick-to: 6.7
Fixes: QTBUG-121552
Change-Id: Ie650a63c595711ca37a3f45be45ef893fff198f4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -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 f09f5bf94..002a63ce9 100644 --- a/CHROMIUM_VERSION +++ b/CHROMIUM_VERSION @@ -1,3 +1,3 @@ Based on Chromium version: 118.0.5993.220 -Patched with security patches up to Chromium version: 120.0.6099.109 +Patched with security patches up to Chromium version: 120.0.6099.224 diff --git a/src/3rdparty b/src/3rdparty -Subproject 97af90e4a36b7b3af90556d1f107154b5106c3d +Subproject e142f6610f4cb6faee64ffaafe8dd197df77e67 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 53a678f27..ece36c315 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -1005,7 +1005,7 @@ const char *qWebEngineChromiumVersion() noexcept const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "120.0.6099.109"; // FIXME: Remember to update + return "120.0.6099.224"; // FIXME: Remember to update } QT_END_NAMESPACE |