Merge branch 'maint-0.4.5'

This commit is contained in:
Nick Mathewson 2021-03-24 12:25:05 -04:00
commit f6af8e2021
2 changed files with 6 additions and 1 deletions

5
changes/ticket40345 Normal file
View File

@ -0,0 +1,5 @@
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

View File

@ -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 */
}