mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-19 19:42:24 +02:00
Code

input/ipc: use bstr for fd parsing

Browse Source 
Also rejects the case of "fd://" without any number which was
silently accepted as 0.
This commit is contained in:
nanahi 2024-07-29 04:20:59 -04:00 committed by Kacper Michajłow
parent bb0932a3ad
commit 40f1a89e40
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/ipc-unix.c
View File

@ -395,11 +395,11 @@ struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api,
if (opts->ipc_client && opts->ipc_client[0]) {
int fd = -1;
if (strncmp(opts->ipc_client, "fd://", 5) == 0) {
char *end;
unsigned long l = strtoul(opts->ipc_client + 5, &end, 0);
if (!end[0] && l <= INT_MAX)
fd = l;
bstr str = bstr0(opts->ipc_client);
if (bstr_eatstart0(&str, "fd://") && str.len) {
long long ll = bstrtoll(str, &str, 0);
if (!str.len && ll >= 0 && ll <= INT_MAX)
fd = ll;
}
if (fd < 0) {
MP_ERR(arg, "Invalid IPC client argument: '%s'\n", opts->ipc_client);

10
input/ipc-win.c
View File

@ -466,11 +466,11 @@ struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api,
if (opts->ipc_client && opts->ipc_client[0]) {
int fd = -1;
if (strncmp(opts->ipc_client, "fd://", 5) == 0) {
char *end;
unsigned long l = strtoul(opts->ipc_client + 5, &end, 0);
if (!end[0] && l <= INT_MAX)
fd = l;
bstr str = bstr0(opts->ipc_client);
if (bstr_eatstart0(&str, "fd://") && str.len) {
long long ll = bstrtoll(str, &str, 0);
if (!str.len && ll >= 0 && ll <= INT_MAX)
fd = ll;
}
if (fd < 0) {
MP_ERR(arg, "Invalid IPC client argument: '%s'\n", opts->ipc_client);