diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-10 13:17:00 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-10 13:23:53 +0100 |
| commit | 995ec51fc37c00c9d554740c270692fdd51e6a24 (patch) | |
| tree | e17c556e5547ab55a282fc309205d55ce3f1db51 /dev-qt | |
| parent | dev-qt/qtwayland: Drop obsolete patches (diff) | |
| download | gentoo-995ec51fc37c00c9d554740c270692fdd51e6a24.tar.gz gentoo-995ec51fc37c00c9d554740c270692fdd51e6a24.tar.bz2 gentoo-995ec51fc37c00c9d554740c270692fdd51e6a24.zip | |
dev-qt/qtwebengine: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch | 48 |
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 - |