File: s0026.patch

package info (click to toggle)
firefox 149.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 4,767,760 kB
  • sloc: cpp: 7,416,064; javascript: 6,752,859; ansic: 3,774,850; python: 1,250,473; xml: 641,578; asm: 439,191; java: 186,617; sh: 56,634; makefile: 18,856; objc: 13,092; perl: 12,763; pascal: 5,960; yacc: 4,583; cs: 3,846; lex: 1,720; ruby: 1,002; php: 436; lisp: 258; awk: 105; sql: 66; sed: 53; csh: 10; exp: 6
file content (22 lines) | stat: -rw-r--r-- 895 bytes parent folder | download | duplicates (3) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
 
From: Jan-Ivar Bruaroey <jib@mozilla.com>
Date: Fri, 18 Aug 2023 13:26:37 -0500
Subject: Bug 1701809: Close dev/video* driver file descriptors after camera
 access on linux. r=ng

Differential Revision: https://phabricator.services.mozilla.com/D110589
---
 modules/video_capture/linux/device_info_v4l2.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/video_capture/linux/device_info_v4l2.cc b/modules/video_capture/linux/device_info_v4l2.cc
index 05205a6138..0d410ed16d 100644
--- a/modules/video_capture/linux/device_info_v4l2.cc
+++ b/modules/video_capture/linux/device_info_v4l2.cc
@@ -330,6 +330,7 @@ int32_t DeviceInfoV4l2::CreateCapabilityMap(const char* deviceUniqueIdUTF8) {
     if (ioctl(fd, VIDIOC_QUERYCAP, &cap) == 0) {
       // skip devices without video capture capability
       if (!IsVideoCaptureDevice(&cap)) {
+        close(fd);
         continue;
       }