Nico Grunbaum
2470df5241
We cherry-picked this in bug 2040112. Upstream commit: https://webrtc.googlesource.com/src/+/7ff59ed9c9d1c7f9126225d30e7a72d80ab3ab4d Wayland capture: Fix integer overflow in cursor bitmap validation Use 64-bit arithmetic for the cursor bitmap bounds check to avoid incorrect results with large values. Bug: chromium:513054275 Change-Id: I9ad3e6e7179223f0f8f548451be3a0e2d6248b9e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/472660 Reviewed-by: Alexander Cooper <alcooper@chromium.org> Commit-Queue: Mark Foltz <mfoltz@chromium.org> Reviewed-by: Mark Foltz <mfoltz@chromium.org> Cr-Commit-Position: refs/heads/main@{#47716}
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From: stransky <stransky@redhat.com>
|
|
Date: Tue, 29 Aug 2023 12:43:00 +0000
|
|
Subject: Bug 1821629 [Pipewire/DMABuf] Don't create dmabuf backend if it's
|
|
disabled r=ng,webrtc-reviewers
|
|
|
|
Depends on D172224
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D172229
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/237d19fe96dd7d25b6a817415ee4e6854678d648
|
|
---
|
|
.../desktop_capture/linux/wayland/shared_screencast_stream.cc | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
index 5e6a22175f..d1cd46ed1a 100644
|
|
--- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
@@ -488,7 +488,7 @@ bool SharedScreenCastStreamPrivate::StartScreenCastStream(
|
|
RTC_LOG(LS_ERROR) << "Unable to open PipeWire library";
|
|
return false;
|
|
}
|
|
- if (!egl_dmabuf_) {
|
|
+ if (!egl_dmabuf_ && mozilla::gfx::IsDMABufEnabled()) {
|
|
egl_dmabuf_ = EglDmaBuf::CreateDefault();
|
|
}
|
|
|
|
@@ -1060,7 +1060,7 @@ bool SharedScreenCastStreamPrivate::ProcessDMABuffer(
|
|
|
|
const uint n_planes = spa_buffer->n_datas;
|
|
|
|
- if (!n_planes) {
|
|
+ if (!n_planes || !egl_dmabuf_) {
|
|
return false;
|
|
}
|
|
|