mirror of https://github.com/mpv-player/mpv
win32: don't jump over variable init with goto
Those variables are accessed after jump.
This commit is contained in:
parent
4449f38c17
commit
d30432ea31
|
@ -360,6 +360,7 @@ static MP_THREAD_VOID ipc_thread(void *p)
|
||||||
mp_thread_set_name("ipc/named-pipe");
|
mp_thread_set_name("ipc/named-pipe");
|
||||||
MP_VERBOSE(arg, "Starting IPC master\n");
|
MP_VERBOSE(arg, "Starting IPC master\n");
|
||||||
|
|
||||||
|
OVERLAPPED ol = {0};
|
||||||
SECURITY_ATTRIBUTES sa = {
|
SECURITY_ATTRIBUTES sa = {
|
||||||
.nLength = sizeof sa,
|
.nLength = sizeof sa,
|
||||||
.lpSecurityDescriptor = create_restricted_sd(),
|
.lpSecurityDescriptor = create_restricted_sd(),
|
||||||
|
@ -369,7 +370,7 @@ static MP_THREAD_VOID ipc_thread(void *p)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
OVERLAPPED ol = { .hEvent = CreateEventW(NULL, TRUE, TRUE, NULL) };
|
ol = (OVERLAPPED){ .hEvent = CreateEventW(NULL, TRUE, TRUE, NULL) };
|
||||||
if (!ol.hEvent) {
|
if (!ol.hEvent) {
|
||||||
MP_ERR(arg, "Couldn't create event");
|
MP_ERR(arg, "Couldn't create event");
|
||||||
goto done;
|
goto done;
|
||||||
|
|
|
@ -253,6 +253,8 @@ void mp_subprocess2(struct mp_subprocess_opts *opts,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
PROCESS_INFORMATION pi = {0};
|
||||||
|
|
||||||
for (int n = 0; n < opts->num_fds; n++) {
|
for (int n = 0; n < opts->num_fds; n++) {
|
||||||
if (opts->fds[n].fd >= crt_fd_max) {
|
if (opts->fds[n].fd >= crt_fd_max) {
|
||||||
// Target FD is too big to fit in the CRT FD array
|
// Target FD is too big to fit in the CRT FD array
|
||||||
|
@ -396,7 +398,6 @@ void mp_subprocess2(struct mp_subprocess_opts *opts,
|
||||||
}
|
}
|
||||||
|
|
||||||
DWORD flags = CREATE_UNICODE_ENVIRONMENT | EXTENDED_STARTUPINFO_PRESENT;
|
DWORD flags = CREATE_UNICODE_ENVIRONMENT | EXTENDED_STARTUPINFO_PRESENT;
|
||||||
PROCESS_INFORMATION pi = {0};
|
|
||||||
|
|
||||||
// Specify which handles are inherited by the subprocess. If this isn't
|
// Specify which handles are inherited by the subprocess. If this isn't
|
||||||
// specified, the subprocess inherits all inheritable handles, which could
|
// specified, the subprocess inherits all inheritable handles, which could
|
||||||
|
|
Loading…
Reference in New Issue