jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a possibly left open file descriptor in v4l2 plugin

Browse Source
This commit is contained in:
fryshorts
2014-07-15 20:45:42 +02:00
parent d03c94a000
commit d8f3761cad
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/linux-v4l2/v4l2-input.c
View File

@@ -299,16 +299,18 @@ static void v4l2_device_list(obs_property_t prop, obs_data_t settings)
dstr_init_copy(&device, "/dev/");
while ((dp = readdir(dirp)) != NULL) {
if (dp->d_type == DT_DIR)
continue;
dstr_resize(&device, 5);
dstr_cat(&device, dp->d_name);
if ((fd = open(device.array, O_RDWR | O_NONBLOCK)) == -1)
continue;
if (ioctl(fd, VIDIOC_QUERYCAP, &video_cap) == -1)
continue;
if (video_cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) {
if (ioctl(fd, VIDIOC_QUERYCAP, &video_cap) == -1) {
} else if (video_cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) {
obs_property_list_add_string(prop,
(char *) video_cap.card,
device.array);
@@ -318,6 +320,7 @@ static void v4l2_device_list(obs_property_t prop, obs_data_t settings)
first = false;
}
}
close(fd);
}