Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Prevent killing unexpected process

Browse source 
A missing initialization (fixed by the previous commit) leaded to kill
unexpected process.

In order to prevent consequences of similar errors in the future, never
call kill() with a non-positive PID.

See <https://github.com/Genymobile/scrcpy/issues/182>.
This commit is contained in:
Romain Vimont 2018-06-22 19:52:22 +02:00
parent 1a0139321b
commit 1846d2f078
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/sys/unix/command.c
View file

@ -1,9 +1,11 @@
#include "command.h" #include "command.h"
#include <signal.h> #include <signal.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include "log.h"
pid_t cmd_execute(const char *path, const char *const argv[]) { pid_t cmd_execute(const char *path, const char *const argv[]) {
pid_t pid = fork(); pid_t pid = fork();
@ -20,6 +22,10 @@ pid_t cmd_execute(const char *path, const char *const argv[]) {
} }
SDL_bool cmd_terminate(pid_t pid) { SDL_bool cmd_terminate(pid_t pid) {
if (pid <= 0) {
LOGC("Requested to kill %d, this is an error. Please report the bug.\n", (int) pid);
abort();
}
return kill(pid, SIGTERM) != -1; return kill(pid, SIGTERM) != -1;
} }