diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-30 11:12:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:10:29 -0400 |
| commit | 4f8086fb20e93c477f033f58da17aa31b9c29fd6 (patch) | |
| tree | cc6d6fb5cc6d7852f82295aa92c87d7068df1271 /src/or/connection.c | |
| parent | 55b5e0076fbd22a78ef2297ccb3a81bf03c42924 (diff) | |
| download | tor-4f8086fb20e93c477f033f58da17aa31b9c29fd6.tar.gz tor-4f8086fb20e93c477f033f58da17aa31b9c29fd6.zip | |
Enable -Wnull-dereference (GCC >=6.1), and fix the easy cases
This warning, IIUC, means that the compiler doesn't like it when it
sees a NULL check _after_ we've already dereferenced the
variable. In such cases, it considers itself free to eliminate the
NULL check.
There are a couple of tricky cases:
One was the case related to the fact that tor_addr_to_in6() can
return NULL if it gets a non-AF_INET6 address. The fix was to
create a variant which asserts on the address type, and never
returns NULL.
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index e70b89767e..86ed2fbccf 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2240,7 +2240,7 @@ connection_send_socks5_connect(connection_t *conn) } else { /* AF_INET6 */ buf[3] = 4; reqsize += 16; - memcpy(buf + 4, tor_addr_to_in6(&conn->addr), 16); + memcpy(buf + 4, tor_addr_to_in6_addr8(&conn->addr), 16); memcpy(buf + 20, &port, 2); } |