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/common/address.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/common/address.c')
| -rw-r--r-- | src/common/address.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/address.c b/src/common/address.c index a6e0f3f491..759b20a094 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -131,7 +131,8 @@ tor_addr_to_sockaddr(const tor_addr_t *a, #endif sin6->sin6_family = AF_INET6; sin6->sin6_port = htons(port); - memcpy(&sin6->sin6_addr, tor_addr_to_in6(a), sizeof(struct in6_addr)); + memcpy(&sin6->sin6_addr, tor_addr_to_in6_assert(a), + sizeof(struct in6_addr)); return sizeof(struct sockaddr_in6); } else { return 0; |