summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-12-10 15:20:44 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-12-10 15:20:44 +0000
commit177349fb1459039cc30cb8e3936af4117d038c16 (patch)
tree34c1bc161daefb8e152212dfba02b98da8a777a5 /dev-qt/qtwebengine/files
parentc15acf374d4b25ba5afcb52435da6090f2d98a20 (diff)
gentoo auto-resync : 10:12:2022 - 15:20:44
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
deleted file mode 100644
index c38bf1bdeeb3..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7e11d69b957595a172a3eb60db17141daed29d63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Mon, 20 Jun 2022 17:19:58 +0200
-Subject: Fixup: CVE-2022-0796: Use after free in Media
-
-Commit ecc2bb74f1f accidentally introduced a build break due to an
-apparent typo.
-
-This fixes it.
-
-Change-Id: I746c6f10ecd2b212b847a291677e24e527d6b922
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- chromium/content/renderer/media/batching_media_log.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-index b68535aea42..a28d426878f 100644
---- a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-+++ b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-@@ -72,18 +72,18 @@ class CONTENT_EXPORT BatchingMediaLog : public media::MediaLog {
- // guarantees provided by MediaLog, since SendQueuedMediaEvents must also
- // be synchronized with respect to AddEvent.
- mutable base::Lock lock_;
-- const base::TickClock* tick_clock_ GUARDED_BY(LOCK);
-- base::TimeTicks last_ipc_send_time_ GUARDED_BY(LOCK);
-- std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(LOCK);
-+ const base::TickClock* tick_clock_ GUARDED_BY(lock_);
-+ base::TimeTicks last_ipc_send_time_ GUARDED_BY(lock_);
-+ std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(lock_);
-
- // impl for sending queued events.
-- std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(LOCK);
-+ std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(lock_);
-
- // For enforcing max 1 pending send.
-- bool ipc_send_pending_ GUARDED_BY(LOCK);
-+ bool ipc_send_pending_ GUARDED_BY(lock_);
-
- // Limits the number of events we send over IPC to one.
-- std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(LOCK);
-+ std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(lock_);
-
- // Holds the earliest MEDIA_ERROR_LOG_ENTRY event added to this log. This is
- // most likely to contain the most specific information available describing
---
-cgit v1.2.1
-