torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson
2018-08-08 18:06:15 -04:00
parent aaa5ca366e c4d0d9bd24
commit 0f0dac0bfc
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/main.c
+5 -4
View File
@@ -4246,10 +4246,10 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
#endif /* defined(NT_SERVICE) */
{
int init_rv = tor_init(argc, argv);
if (init_rv < 0)
return -1;
else if (init_rv > 0)
return 0;
if (init_rv) {
tor_free_all(0);
return (init_rv < 0) ? -1 : 0;
}
}
if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) {
@@ -4257,6 +4257,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
if (sandbox_init(cfg)) {
log_err(LD_BUG,"Failed to create syscall sandbox filter");
tor_free_all(0);
return -1;
}