diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-05 10:08:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-06-05 10:08:27 -0400 |
| commit | 1fb9be53969011a10c453a36099583f631dc8a09 (patch) | |
| tree | f1eddd4171602f5b1701f36f22c38da469c645d2 /src/core | |
| parent | b335ef178156e2a6825c48a04222384869c08c5f (diff) | |
| parent | 3e4814edeb563535b0f3bf658c01d7c10d6b4aa2 (diff) | |
| download | tor-1fb9be53969011a10c453a36099583f631dc8a09.tar.gz tor-1fb9be53969011a10c453a36099583f631dc8a09.zip | |
Merge remote-tracking branch 'tor-github/pr/1902/head'
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/or/connection_edge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 5c9bf64e8e..fc77db8334 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -3459,8 +3459,9 @@ tell_controller_about_resolved_result(entry_connection_t *conn, expires = time(NULL) + ttl; if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); - control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL, 0); + if (cp) + control_event_address_mapped(conn->socks_request->address, + cp, expires, NULL, 0); tor_free(cp); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) { char *cp = tor_strndup(answer, answer_len); |