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

Fix possible minor memory leak when parsing helpernode state

Browse Source 
svn:r5305
This commit is contained in:
Nick Mathewson 2005-10-25 07:00:03 +00:00
parent 8af3fc53f4
commit 26caf69555
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/or/circuitbuild.c
View File

@ -150,7 +150,7 @@ circuit_list_path(circuit_t *circ, int verbose)
* exit point. * exit point.
*/ */
void void
circuit_log_path(int severity, int domain, circuit_t *circ) circuit_log_path(int severity, unsigned int domain, circuit_t *circ)
{ {
char *s = circuit_list_path(circ,1); char *s = circuit_list_path(circ,1);
log(severity,domain,"%s",s); log(severity,domain,"%s",s);
@ -641,8 +641,7 @@ circuit_extend(cell_t *cell, circuit_t *circ)
char tmpbuf[INET_NTOA_BUF_LEN]; char tmpbuf[INET_NTOA_BUF_LEN];
in.s_addr = htonl(circ->n_addr); in.s_addr = htonl(circ->n_addr);
tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf));
/* XXXX LD_OR? NM */ info(LD_CIRC|LD_OR,"Next router (%s:%d) not connected. Connecting.",
info(LD_CIRC,"Next router (%s:%d) not connected. Connecting.",
tmpbuf, circ->n_port); tmpbuf, circ->n_port);
memcpy(circ->onionskin, onionskin, ONIONSKIN_CHALLENGE_LEN); memcpy(circ->onionskin, onionskin, ONIONSKIN_CHALLENGE_LEN);
@ -1217,7 +1216,6 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
return router; return router;
} }
if (options->StrictExitNodes) { if (options->StrictExitNodes) {
/* XXXX NM LD_DIR? */
warn(LD_CIRC, "No exit routers seem to be running; can't choose an exit."); warn(LD_CIRC, "No exit routers seem to be running; can't choose an exit.");
} }
return NULL; return NULL;
@ -1880,18 +1878,19 @@ helper_nodes_parse_state(or_state_t *state, int set, const char **err)
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
if (smartlist_len(args)<2) { if (smartlist_len(args)<2) {
*err = "Too few arguments to HelperNode"; *err = "Too few arguments to HelperNode";
break; } else if (!is_legal_nickname(smartlist_get(args,0))) {
}
if (!is_legal_nickname(smartlist_get(args,0))) {
*err = "Bad nickname for HelperNode"; *err = "Bad nickname for HelperNode";
break; } else {
strlcpy(node->nickname, smartlist_get(args,0), MAX_NICKNAME_LEN+1);
if (base16_decode(node->identity, DIGEST_LEN, smartlist_get(args,1),
strlen(smartlist_get(args,1)))<0) {
*err = "Bad hex digest for HelperNode";
}
} }
strlcpy(node->nickname, smartlist_get(args,0), MAX_NICKNAME_LEN+1); SMARTLIST_FOREACH(args, char*, cp, tor_free(cp));
if (base16_decode(node->identity, DIGEST_LEN, smartlist_get(args,1), smartlist_free(args);
strlen(smartlist_get(args,1)))<0) { if (*err)
*err = "Bad hex digest for HelperNode";
break; break;
}
} else { } else {
time_t when; time_t when;
if (!node) { if (!node) {