1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-17 11:26:41 +02:00

Do proper error handling for a few malloc calls

This commit is contained in:
jfreegman
2021-12-12 11:30:27 -05:00
parent 3eac65036c
commit bf1e1b73fc
3 changed files with 26 additions and 3 deletions

View File

@@ -209,12 +209,24 @@ VideoDeviceError init_video_devices(void)
/* Query V4L for capture capabilities */
if (-1 != ioctl(fd, VIDIOC_QUERYCAP, &cap)) {
video_input_name = (char *)malloc(strlen((const char *)cap.card) + strlen(device_address) + 4);
if (video_input_name == NULL) {
close(fd);
return vde_InternalError;
}
strcpy(video_input_name, (char *)cap.card);
strcat(video_input_name, " (");
strcat(video_input_name, (char *)device_address);
strcat(video_input_name, ")");
} else {
video_input_name = (char *)malloc(strlen(device_address) + 3);
if (video_input_name == NULL) {
close(fd);
return vde_InternalError;
}
strcpy(video_input_name, "(");
strcat(video_input_name, device_address);
strcat(video_input_name, ")");