diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-13 15:51:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 15:51:09 +0100 |
| commit | 59495adb7c4b4dc2374a4a4d8cd0360ccf293a32 (patch) | |
| tree | 74d7a30c6f44ad74dccd398c475c6505e9c2c22a /drivers/unix | |
| parent | a8cf045fd0c17dab73f648d0815d22677a252c77 (diff) | |
| parent | 89225884f6f5020fbcb40fc188f0d43c4b435d1c (diff) | |
Merge pull request #45157 from madmiraal/fix-44514
Raise SIGKILL instead of CRASH_NOW in child process when fork fails
Diffstat (limited to 'drivers/unix')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 81ba4369a6..d94c2126ef 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -313,7 +313,8 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, St execvp(p_path.utf8().get_data(), &args[0]); // The execvp() function only returns if an error occurs. - CRASH_NOW_MSG("Could not create child process: " + p_path); + ERR_PRINT("Could not create child process: " + p_path); + raise(SIGKILL); } int status; @@ -354,7 +355,8 @@ Error OS_Unix::create_process(const String &p_path, const List<String> &p_argume execvp(p_path.utf8().get_data(), &args[0]); // The execvp() function only returns if an error occurs. - CRASH_NOW_MSG("Could not create child process: " + p_path); + ERR_PRINT("Could not create child process: " + p_path); + raise(SIGKILL); } if (r_child_id) { |