diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2022-06-20 17:19:58 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2022-06-20 17:07:54 +0000 |
| commit | 7e11d69b957595a172a3eb60db17141daed29d63 (patch) | |
| tree | acfc9c7713a23298f32b6ef065a184afb4bf5be1 /chromium | |
| parent | ecc2bb74f1f7140fc52650042299be18e826b27b (diff) | |
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>
Diffstat (limited to 'chromium')
| -rw-r--r-- | chromium/content/renderer/media/batching_media_log.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/content/renderer/media/batching_media_log.h b/chromium/content/renderer/media/batching_media_log.h index b68535aea42..a28d426878f 100644 --- a/chromium/content/renderer/media/batching_media_log.h +++ b/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 |