mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

v4l2: fix string size

Browse source 
vendor_id and product_id are encoded as 0xHHHH and so it needs 7 chars
with the 0.

See #4034
This commit is contained in:
Wim Taymans 2024-06-06 16:25:24 +02:00
parent 961134dc72
commit 1d9a00a66f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spa/plugins/v4l2/v4l2-device.c
View file

@ -32,8 +32,8 @@ static const char default_device[] = "/dev/video0";
struct props { struct props {
char device[64]; char device[64];
char devnum[32]; char devnum[32];
char product_id[6]; char product_id[7];
char vendor_id[6]; char vendor_id[7];
int device_fd; int device_fd;
}; };
@ -244,13 +244,13 @@ impl_init(const struct spa_handle_factory *factory,
reset_props(&this->props); reset_props(&this->props);
if (info && (str = spa_dict_lookup(info, SPA_KEY_API_V4L2_PATH))) if (info && (str = spa_dict_lookup(info, SPA_KEY_API_V4L2_PATH)))
strncpy(this->props.device, str, 63); strncpy(this->props.device, str, sizeof(this->props.device)-1);
if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_DEVIDS))) if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_DEVIDS)))
strncpy(this->props.devnum, str, 31); strncpy(this->props.devnum, str, sizeof(this->props.devnum)-1);
if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_PRODUCT_ID))) if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_PRODUCT_ID)))
strncpy(this->props.product_id, str, 5); strncpy(this->props.product_id, str, sizeof(this->props.product_id)-1);
if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_VENDOR_ID))) if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_VENDOR_ID)))
strncpy(this->props.vendor_id, str, 5); strncpy(this->props.vendor_id, str, sizeof(this->props.vendor_id)-1);
return 0; return 0;
} }