commit | 932e069f0f0b5cb42404fde6b98696bf236a8f25 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jul 11 06:47:19 2022 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jul 11 06:47:19 2022 +0000 |
tree | ac8de8de56d8659a68fe8e59c793ceb4f3c4e04e | |
parent | ff3fdf36ef33623a567614d9baf792399c89219d [diff] | |
parent | 5caaa5575ec8b97a55de472dd54e59d4fad15663 [diff] |
Merge "Don't kill subcontext if it's null"
diff --git a/init/subcontext.cpp b/init/subcontext.cpp index bb3967e..bd2bec5 100644 --- a/init/subcontext.cpp +++ b/init/subcontext.cpp
@@ -381,6 +381,9 @@ } void SubcontextTerminate() { + if (!subcontext) { + return; + } subcontext_terminated_by_shutdown = true; kill(subcontext->pid(), SIGTERM); }