diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2020-03-08 19:44:41 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2020-03-08 19:44:41 +0000 |
| commit | 01b2b9b6d686bc18bef1de49a5bf1bc05ebdb09d (patch) | |
| tree | fddb8430ac8db17b2895d797431b5dd7b48af59b /www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc | |
| parent | 121ae90af1478922bd6e8e96a81f210a96806aa8 (diff) | |
| download | ports-01b2b9b6d686bc18bef1de49a5bf1bc05ebdb09d.tar.gz ports-01b2b9b6d686bc18bef1de49a5bf1bc05ebdb09d.zip | |
www/chromium: update to 80.0.3987.132
This addresses some security issues, including at least one Google admits was
being exploited in the wild. For more, see:
https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html
PR: 244625
Approved by: jrm, rene
Security: CVE-2020-6407, CVE-2020-6418 (in the wild), CVE-2020-6420
Differential Revision: https://reviews.freebsd.org/D23984
Notes
Notes:
svn path=/head/; revision=528072
Diffstat (limited to 'www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc')
| -rw-r--r-- | www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 1bdde4d999b0..4f312cd5d1f1 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,18 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2019-12-16 21:51:27 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-03-03 18:53:55 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -56,7 +56,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( +@@ -20,9 +20,9 @@ + #include "ui/gfx/mojom/buffer_types_mojom_traits.h" + #include "ui/gfx/mojom/color_space_mojom_traits.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/posix/eintr_wrapper.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace mojo { + +@@ -60,7 +60,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( mojo_frame->PlaneOffset(media::VideoFrame::kVPlane))); } @@ -9,7 +21,7 @@ if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { std::vector<mojo::ScopedHandle> dmabuf_fds; -@@ -157,7 +157,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, +@@ -161,7 +161,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, shared_buffer_data.u_offset(), shared_buffer_data.v_offset(), shared_buffer_data.y_stride(), shared_buffer_data.u_stride(), shared_buffer_data.v_stride(), timestamp); |