diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-03-24 12:25:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-03-24 12:25:05 -0400 |
| commit | f6af8e2021179498d3e964ea068f9b0aa8b8f8e4 (patch) | |
| tree | 28a729d2bb344cda58c8a665235a85bb89a75e0d | |
| parent | 37b16d7e1977647d297c165afa0435536a474264 (diff) | |
| parent | c359c3056b2dbf17987a8955af30884ee438108e (diff) | |
| download | tor-f6af8e2021179498d3e964ea068f9b0aa8b8f8e4.tar.gz tor-f6af8e2021179498d3e964ea068f9b0aa8b8f8e4.zip | |
Merge branch 'maint-0.4.5'
| -rw-r--r-- | changes/ticket40345 | 5 | ||||
| -rw-r--r-- | src/core/or/channel.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/ticket40345 b/changes/ticket40345 new file mode 100644 index 0000000000..246e4a86af --- /dev/null +++ b/changes/ticket40345 @@ -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 + diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 97e1d5f278..c4f3e76fc8 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -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 */ } |