nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cov_run224_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2011-10-26 13:22:51 -04:00
commit 6df3869f3b
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/cov_485,486,487 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix memory leaks in the failing cases of the new SocksPort and
ControlPort code. Found by Coverity Scan. Bugfix on
0.2.3.3-alpha; fixes coverity CID 485, 486, and 487.

7
src/or/config.c
View File

@ -1077,8 +1077,11 @@ options_act_reversible(const or_options_t *old_options, char **msg)
} }
/* Adjust the client port configuration so we can launch listeners. */ /* Adjust the client port configuration so we can launch listeners. */
if (parse_client_ports(options, 0, msg, &n_client_ports)) if (parse_client_ports(options, 0, msg, &n_client_ports)) {
return -1; if (!*msg)
*msg = tor_strdup("Unexpected problem parsing client port config");
goto rollback;
}
/* Set the hibernation state appropriately.*/ /* Set the hibernation state appropriately.*/
consider_hibernation(time(NULL)); consider_hibernation(time(NULL));

4
src/or/connection.c
View File

@ -1988,13 +1988,13 @@ retry_all_listeners(smartlist_t *replaced_conns,
options->ControlListenAddress, options->ControlListenAddress,
options->ControlPort, "127.0.0.1", options->ControlPort, "127.0.0.1",
new_conns, 0) < 0) new_conns, 0) < 0)
return -1; retval = -1;
if (retry_listeners(listeners, if (retry_listeners(listeners,
CONN_TYPE_CONTROL_LISTENER, CONN_TYPE_CONTROL_LISTENER,
options->ControlSocket, options->ControlSocket,
options->ControlSocket ? 1 : 0, NULL, options->ControlSocket ? 1 : 0, NULL,
new_conns, 1) < 0) new_conns, 1) < 0)
return -1; retval = -1;
/* Any members that were still in 'listeners' don't correspond to /* Any members that were still in 'listeners' don't correspond to
* any configured port. Kill 'em. */ * any configured port. Kill 'em. */