summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2022-06-29 10:53:53 +0200
committerMichael BrĂ¼ning <michael.bruning@qt.io>2022-07-06 09:42:50 +0200
commitb902710671816fb4886ca7c3883de9da3ec14951 (patch)
tree441799eea064d595816db2ba5c1280105267bf18
parent3d81e3ffaf61694405eab8ba4ff5966e91a3a602 (diff)
Update Chromium
Submodule src/3rdparty 660d61d9..5f975374: > Fix broken bundled zlib for cross compilation > FIXUP: Fix url_utils for QtWebEngine > Bump V8_PATCH_LEVEL > [Backport] Security bug 1316578 > [Backport] CVE-2022-2008: Out of bounds memory access in WebGL > [Backport] CVE-2022-2010: Out of bounds read in compositing > [Backport] CVE-2022-1876: Heap buffer overflow in DevTools > [Backport] CVE-2022-1873: Insufficient policy enforcement in COOP. > [Backport] CVE-2022-1866: Use after free in Tablet Mode > [Backport] Security bug 1318610 > [Backport] CVE-2022-1867: Insufficient validation of untrusted input in Data Transfer > [Backport] Security bug 1306751 > [Backport] Security bug 1306968 > [Backport] Security bug 1303552 > [Backport] CVE-2022-1855: Use after free in Messaging > [Backport] CVE-2022-1857: Insufficient policy enforcement in File System API > [Backport] CVE-2022-1854: Use after free in ANGLE. > [Backport] CVE-2022-1853: Use after free in Indexed DB > [Backport] Dependency for CVE-2022-1853: Use after free in Indexed DB > Make sure we do not compile minizip from 3rdparty > Fix use_system_freetype Task-number: QTBUG-104636 Change-Id: Iddd74315f5efc429c9d910096c5e67d803696777 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-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 f30101743..8b10164db 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: 101.0.4951.64
+Patched with security patches up to Chromium version: 102.0.5005.115
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 660d61d9f1886367e12e741f8793df758975969
+Subproject 5f9753749b6c138c1d5bc390006396e9a65b19a
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index b209e4f6f..f6bc6f630 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -920,7 +920,7 @@ const char *qWebEngineChromiumVersion() noexcept
}
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "101.0.4951.64"; // FIXME: Remember to update
+ return "102.0.5005.115"; // FIXME: Remember to update
}
QT_END_NAMESPACE