summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2022-06-01 10:58:24 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2022-06-07 18:13:36 +0000
commite8b07fcff53936e56ca38179325c56eb3a013116 (patch)
treeb8dfc363d693091dfd16783595bd474e515faab8
parent81f3da54b9e79b5d90eec229d1744cd680f06ec3 (diff)
Update Chromium
Submodule src/3rdparty 5cd4e9af..660d61d9: > [Backport] Avoid using FreeType 2.11.0 COLRv1 headers > Minor. Use FilePath directly for qt sandbox path > Fix angle build after a056b2278a97 > [Backport] CVE-2022-1494: Insufficient data validation in Trusted Types > FIXUP: Disable alternate window station of Windows sandbox > [Backport] Security bug 1298867 > [Backport] Security bug 1312563 > [Backport] CVE-2022-1638: Heap buffer overflow in V8 Internationalization > [Backport] CVE-2022-1639: Use after free in ANGLE > [Backport] CVE-2022-1636: Use after free in Performance APIs > [Backport] CVE-2022-1493: Use after free in Dev Tools > Find fontconfig using pkg-config > [Backport] Security bug 1296334 > [Backport] Security bug 1307223 > [Backport] CVE-2022-1492: Insufficient data validation in Blink Editing > [Backport] CVE-2022-1498: Inappropriate implementation in HTML Parser > [Backport] CVE-2022-1497: Inappropriate implementation in Input > [Backport] CVE-2022-1487: Use after free in Ozone > [Backport] CVE-2022-1486: Type Confusion in V8 > [Backport] CVE-2022-1483: Heap buffer overflow in WebGPU > [Backport] CVE-2022-1482: Inappropriate implementation in WebGL. > [Backport] CVE-2022-1479: Use after free in ANGLE > [Backport] CVE-2022-1477: Use after free in Vulkan > [Backport] CVE-2022-1138: Inappropriate implementation in Web Cursor. > Fix no-printing builds on mac > Minor. Add defined to checks > FIXUP: Fix jumbo build > [Backport] Security bug 1292905 > [Backport] CVE-2022-1314: Type Confusion in V8 > [Backport] CVE-2022-1310: Use after free in regular expressions > [Backport] CVE-2022-1305: Use after free in storage > [Backport] Security bug 1306507 > Fix mac toolchain python linker script call > Workaround MSVC2022 ICE in constexpr functions > [Backport] CVE-2022-1364: Type Confusion in V8 Task-number: QTBUG-103032 Task-number: QTBUG-103035 Task-number: QTBUG-103036 Change-Id: I19b85bdda74d96dc597733c8dc996ab92967ee31 Reviewed-by: Michael BrĂ¼ning <michael.bruning@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 2ec45229b..f30101743 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
+Patched with security patches up to Chromium version: 101.0.4951.64
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 5cd4e9af5765778abc0380fc0fc6e06c43fcdfe
+Subproject 660d61d9f1886367e12e741f8793df758975969
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 9727efab1..16232d3b0 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -918,7 +918,7 @@ const char *qWebEngineChromiumVersion() noexcept
}
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "99.0.4844.84"; // FIXME: Remember to update
+ return "101.0.4951.64"; // FIXME: Remember to update
}
QT_END_NAMESPACE