Skip to content
Snippets Groups Projects
Commit c359c305 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge branch 'maint-0.4.4' into maint-0.4.5

parents 59bbf8cd 9ca2394d
No related branches found
No related tags found
No related merge requests found
o Minor bugfixes (channel, DoS):
- Fix a possible non fatal assertion BUG() due to a too early free of a
string when noting down the client connection for the DoS defenses
subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc
......@@ -1882,11 +1882,11 @@ channel_do_open_actions(channel_t *chan)
geoip_note_client_seen(GEOIP_CLIENT_CONNECT,
&remote_addr, transport_name,
now);
tor_free(transport_name);
/* Notify the DoS subsystem of a new client. */
if (tlschan && tlschan->conn) {
dos_new_client_conn(tlschan->conn, transport_name);
}
tor_free(transport_name);
}
/* Otherwise the underlying transport can't tell us this, so skip it */
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment