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

Merge branch 'bug7014_023_squashed' into maint-0.2.3

Browse Source
This commit is contained in:
Nick Mathewson 2012-10-09 23:46:56 -04:00
commit e2549c3b74
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug7014 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix two cases in src/or/transports.c where we were calling
fmt_addr() twice in a parameter list. Bug found by David
Fifield. Fixes bug 7014; bugfix on 0.2.3.9-alpha.

7
src/or/circuitbuild.c
View File

@ -5310,19 +5310,22 @@ transport_resolve_conflicts(transport_t *t)
t_tmp->marked_for_removal = 0; t_tmp->marked_for_removal = 0;
return 1; return 1;
} else { /* same name but different addrport */ } else { /* same name but different addrport */
char *new_transport_addr = tor_strdup(fmt_addr(&t->addr));
if (t_tmp->marked_for_removal) { /* marked for removal */ if (t_tmp->marked_for_removal) { /* marked for removal */
log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' "
"but there was already a transport marked for deletion at " "but there was already a transport marked for deletion at "
"'%s:%u'. We deleted the old transport and registered the " "'%s:%u'. We deleted the old transport and registered the "
"new one.", t->name, fmt_addr(&t->addr), t->port, "new one.", t->name, new_transport_addr, t->port,
fmt_addr(&t_tmp->addr), t_tmp->port); fmt_addr(&t_tmp->addr), t_tmp->port);
smartlist_remove(transport_list, t_tmp); smartlist_remove(transport_list, t_tmp);
transport_free(t_tmp); transport_free(t_tmp);
tor_free(new_transport_addr);
} else { /* *not* marked for removal */ } else { /* *not* marked for removal */
log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' "
"but the same transport already exists at '%s:%u'. " "but the same transport already exists at '%s:%u'. "
"Skipping.", t->name, fmt_addr(&t->addr), t->port, "Skipping.", t->name, new_transport_addr, t->port,
fmt_addr(&t_tmp->addr), t_tmp->port); fmt_addr(&t_tmp->addr), t_tmp->port);
tor_free(new_transport_addr);
return -1; return -1;
} }
} }