summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-06 16:21:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-07 11:43:01 +0200
commit387fb9377d61683bcd0f59a637afffdd9a16912c (patch)
tree0de30a1e40577088dca1ad4a6c0f7c860d26dfba
parent950e462b1d369f8140a1d54078d42b5f057adfdb (diff)
Two security fixes from latest Chrome 81 release Changes: aeb7ab73da2 Fix initialize of cdm for sandbox from widevine-path e6dee42d4b9 Compile fix: Use size_t and not uint32_t for CalculatePitchAndSize e1e4198d872 Speculative fix for xkbcommon include eaf11e78eaf Fix build with GCC 10 d2576708e9c [Backport] Fix for CVE-2020-6464 8b2e2db6f1f FIXUP: Fixes for jumbo build 623647821aa [Backport] Update usrsctp to 81-version (CVE-2020-6831) Fixes: QTBUG-83618 Change-Id: Iec4ce2f9e8fe2e9ed2b670c265444669a4c75b93 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--dist/changes-5.15.02
m---------src/3rdparty0
2 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0
index a5e3da7a1..630a70852 100644
--- a/dist/changes-5.15.0
+++ b/dist/changes-5.15.0
@@ -36,7 +36,7 @@ Chromium Snapshot
-----------------
- Updated the Chromium version to 80.0.3987.163
- - Applied security fixes from Chrome up to version 81.0.4044.129
+ - Applied security fixes from Chrome up to version 81.0.4044.138
General
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 6f260e5b2f717b9977045419f12c7c35d31f9a9
+Subproject 623647821aa7c7565ed5153a27c5a1bb088efbe