nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'weasel/bug18261'

Browse Source
This commit is contained in:
Nick Mathewson 2016-02-11 12:12:02 -05:00
commit bc7a5eeeda
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug18261 Normal file
View File

@ -0,0 +1,6 @@
o Minor features (crypto):
- Fix a segfault during startup: If unix socket was configured as
listener (such as a ControlSocket or a SocksPort unix socket), and
tor was started as root but not configured to switch to another
user, tor would segfault while trying to string compare a NULL
value. Fixes bug 18261; bugfix on 0.2.8.1-alpha. Patch by weasel.

2
src/or/connection.c
View File

@ -2397,7 +2397,7 @@ retry_listener_ports(smartlist_t *old_conns,
/* We don't need to be root to create a UNIX socket, so defer until after
* setuid. */
const or_options_t *options = get_options();
if (port->is_unix_addr && !geteuid() && strcmp(options->User, "root"))
if (port->is_unix_addr && !geteuid() && (options->User) && strcmp(options->User, "root"))
continue;
#endif