diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
| commit | d6b2af7a3aba24cf3d77587c41028aad70d59605 (patch) | |
| tree | a6d8687d4055a9e27fbcb406cfb518295469bf0c /src/common/address.c | |
| parent | c274f825da18f33f12eb78260d1c78d5f685d959 (diff) | |
| parent | e80a032b61e3c793ad0d1627074b8750f7cfec48 (diff) | |
| download | tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.tar.gz tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.zip | |
Merge branch 'bug19180_easy_squashed'
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 01607a4b3a..127e6a95bc 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; |