diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-07 13:15:21 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-15 09:27:15 +0000 |
| commit | ee36c2a7423fb0c502c47226c351dd1842081e09 (patch) | |
| tree | 03d1d530361acb6c44b020f0bc0c69344fbca2a3 | |
| parent | b18ed7089f22839621883e5a9e3903c22128b21a (diff) | |
Update Chromium
Submodule src/3rdparty 82da2de9a..1dc53de69:
> [Backport] CVE-2022-3040: Use after free in Layout
> [Backport] CVE-2022-3041: Use after free in WebSQL
> [Backport] CVE-2022-3038: Use after free in Network Service
> Merge branch 'upstream-master' into 102-based
> FIXUP: Trim down some dependencies of push messaging
> Fixup partial application of macOS OpenGL pixel format selection patch
Fixes: QTBUG-106254
Change-Id: Ifd55481c8d26f0e2cf8cb9e01cdaa8aa530354d8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit fbdb72b4981a9ec471756b5aac17376fe0a0c0d6)
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 1 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index f3424da5c..57dd9c61f 100644 --- a/CHROMIUM_VERSION +++ b/CHROMIUM_VERSION @@ -1,3 +1,3 @@ -Based on Chromium version: 102.0.5005.137 +Based on Chromium version: 102.0.5005.177 Patched with security patches up to Chromium version: 104.0.5112.102 diff --git a/src/3rdparty b/src/3rdparty -Subproject 82da2de9a7b0261bc5c765219147cd20621fccb +Subproject 1dc53de694e05a192d4757835f66e0797b7d29b diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 4c115b9c5..0a968099c 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -101,6 +101,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('content/shell/android/') or file_path.startswith('content/shell/browser/') or file_path.startswith('courgette') + or file_path.startswith('docs/website/') or file_path.startswith('google_update') or file_path.startswith('ios') or file_path.startswith('media/base/android/java') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 407f5f2cc..921e97f36 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -12,7 +12,7 @@ import json import urllib3 import git_submodule as GitSubmodule -chromium_version = '102.0.5005.137' +chromium_version = '102.0.5005.177' chromium_branch = '5005' ninja_version = 'v1.8.2' |