mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Exit immediately if we can't monitor our owning controller process
tor_process_monitor_new can't currently return NULL, but if it ever can, we want that to be an explicitly fatal error, without relying on the fact that monitor_owning_controller_process's chain of caller will exit if it fails.
This commit is contained in:
+10
-10
@@ -3815,8 +3815,8 @@ owning_controller_procmon_cb(void *unused)
|
||||
}
|
||||
|
||||
/** Set <b>process_spec</b> as Tor's owning controller process.
|
||||
* Return 0 on success, -1 on failure. */
|
||||
int
|
||||
* Exit on failure. */
|
||||
void
|
||||
monitor_owning_controller_process(const char *process_spec)
|
||||
{
|
||||
const char *msg;
|
||||
@@ -3829,7 +3829,7 @@ monitor_owning_controller_process(const char *process_spec)
|
||||
owning_controller_process_spec)) {
|
||||
/* Same process -- return now, instead of disposing of and
|
||||
* recreating the process-termination monitor. */
|
||||
return 0;
|
||||
return;
|
||||
}
|
||||
|
||||
/* We are currently owned by a process, and we should no longer be
|
||||
@@ -3845,7 +3845,7 @@ monitor_owning_controller_process(const char *process_spec)
|
||||
(owning_controller_process_monitor == NULL));
|
||||
|
||||
if (process_spec == NULL)
|
||||
return 0;
|
||||
return;
|
||||
|
||||
owning_controller_process_spec = tor_strdup(process_spec);
|
||||
owning_controller_process_monitor =
|
||||
@@ -3856,13 +3856,13 @@ monitor_owning_controller_process(const char *process_spec)
|
||||
&msg);
|
||||
|
||||
if (owning_controller_process_monitor == NULL) {
|
||||
log_warn(LD_CONTROL, "Couldn't create process-termination monitor for "
|
||||
"owning controller: %s",
|
||||
msg);
|
||||
return -1;
|
||||
log_err(LD_BUG, "Couldn't create process-termination monitor for "
|
||||
"owning controller: %s. Exiting.",
|
||||
msg);
|
||||
owning_controller_process_spec = NULL;
|
||||
tor_cleanup();
|
||||
exit(0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Convert the name of a bootstrapping phase <b>s</b> into strings
|
||||
|
||||
Reference in New Issue
Block a user