mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-24 08:20:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

linux-v4l2: Fix resource leak on device open error path

Browse Source
This commit is contained in:
Stefan Hoffmeister
2022-09-12 15:15:16 +02:00
committed by Jim
parent e64b1117fc
commit e8f27c2a79
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/linux-v4l2/v4l2-output.c
View File

@@ -128,12 +128,12 @@ static bool try_connect(void *data, const char *device)
return false;
if (ioctl(vcam->device, VIDIOC_QUERYCAP, &capability) < 0)
return false;
goto fail_close_device;
format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
if (ioctl(vcam->device, VIDIOC_G_FMT, &format) < 0)
return false;
goto fail_close_device;
struct obs_video_info ovi;
obs_get_video_info(&ovi);
@@ -146,7 +146,7 @@ static bool try_connect(void *data, const char *device)
parm.parm.output.timeperframe.denominator = ovi.fps_num;
if (ioctl(vcam->device, VIDIOC_S_PARM, &parm) < 0)
return false;
goto fail_close_device;
format.fmt.pix.width = width;
format.fmt.pix.height = height;
@@ -154,7 +154,7 @@ static bool try_connect(void *data, const char *device)
format.fmt.pix.sizeimage = vcam->frame_size;
if (ioctl(vcam->device, VIDIOC_S_FMT, &format) < 0)
return false;
goto fail_close_device;
struct video_scale_info vsi = {0};
vsi.format = VIDEO_FORMAT_YUY2;
@@ -166,6 +166,10 @@ static bool try_connect(void *data, const char *device)
obs_output_begin_data_capture(vcam->output, 0);
return true;
fail_close_device:
close(vcam->device);
return false;
}
static int scanfilter(const struct dirent *entry)