Skip to content

Commit

Permalink
Merge pull request #45157 from madmiraal/fix-44514
Browse files Browse the repository at this point in the history
Raise SIGKILL instead of CRASH_NOW in child process when fork fails
  • Loading branch information
akien-mga authored Jan 13, 2021
2 parents a8cf045 + 8922588 commit 59495ad
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/unix/os_unix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 59495ad

Please sign in to comment.