diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-08-11 14:54:26 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-08-11 14:54:26 +0300 |
| commit | b8003fbe99da4657ba408dc69602700956b9c2fb (patch) | |
| tree | ea01dc5de7a1920375a96197e8a26c8eca88838e /src/core/mainloop | |
| parent | 069946852a5f847e92062cd1b2a56c20935592b2 (diff) | |
| parent | ab9c35f04353c00323068ec5dc46b2995a9b69bf (diff) | |
| download | tor-b8003fbe99da4657ba408dc69602700956b9c2fb.tar.gz tor-b8003fbe99da4657ba408dc69602700956b9c2fb.zip | |
Merge branch 'maint-0.4.4'
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/connection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index b89a4ae796..c68546e375 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -831,7 +831,7 @@ connection_free_minimal(connection_t *conn) } } - tor_free(conn->address); + tor_str_wipe_and_free(conn->address); if (connection_speaks_cells(conn)) { or_connection_t *or_conn = TO_OR_CONN(conn); @@ -851,7 +851,7 @@ connection_free_minimal(connection_t *conn) } or_handshake_state_free(or_conn->handshake_state); or_conn->handshake_state = NULL; - tor_free(or_conn->nickname); + tor_str_wipe_and_free(or_conn->nickname); if (or_conn->chan) { /* Owww, this shouldn't happen, but... */ channel_t *base_chan = TLS_CHAN_TO_BASE(or_conn->chan); @@ -871,8 +871,8 @@ connection_free_minimal(connection_t *conn) } if (conn->type == CONN_TYPE_AP) { entry_connection_t *entry_conn = TO_ENTRY_CONN(conn); - tor_free(entry_conn->chosen_exit_name); - tor_free(entry_conn->original_dest_address); + tor_str_wipe_and_free(entry_conn->chosen_exit_name); + tor_str_wipe_and_free(entry_conn->original_dest_address); if (entry_conn->socks_request) socks_request_free(entry_conn->socks_request); if (entry_conn->pending_optimistic_data) { |