summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2021-09-08 15:17:03 +0200
committerMichael BrĂ¼ning <michael.bruning@qt.io>2021-09-09 22:10:45 +0200
commitb0aab543293ccfa6f43276cdfc92a7a1cf1478ad (patch)
tree63ec8f1b97729500f41181b9e860a6bd7f2f3ca8
parent16b2059e0c1990e1533e4222da5f899650e4078e (diff)
Update Chromium
Submodule src/3rdparty f8a944bb..202e3447: > [Backport] CVE-2021-30566: Stack buffer overflow in Printing > [Backport] CVE-2021-30618: Inappropriate implementation in DevTools > [Backport] CVE-2021-30616: Use after free in Media. > [Backport] Security bug 1227228 > [Backport] Security bug 1239116 > [Backport] Security bug 1216595 > [Backport] Security bug 1206289 > [Backport] CVE-2021-30613: Use after free in Base internals Pick-to: 6.2 6.2.0 Change-Id: I52c611ae7029baafcc182a6d66890f4bfff81d34 Fixes: QTBUG-96209 Task-number: QTBUG-96292 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
m---------src/3rdparty0
-rw-r--r--src/core/printing/print_view_manager_base_qt.cpp5
2 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject f8a944bbe5fb9c7f1886a76f8243f1edf67fc04
+Subproject 202e34476e934633b3c2e4679a53c4b0847364a
diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp
index b8e18e7d7..8d2d1bfd6 100644
--- a/src/core/printing/print_view_manager_base_qt.cpp
+++ b/src/core/printing/print_view_manager_base_qt.cpp
@@ -383,6 +383,11 @@ void PrintViewManagerBaseQt::GetDefaultPrintSettings(GetDefaultPrintSettingsCall
void PrintViewManagerBaseQt::PrintingFailed(int32_t cookie)
{
+ // Note: Not redundant with cookie checks in the same method in other parts of
+ // the class hierarchy.
+ if (!IsValidCookie(cookie))
+ return;
+
PrintManager::PrintingFailed(cookie);
ReleasePrinterQuery();