diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-02 11:58:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-02 11:58:08 -0400 |
| commit | e3c143f5214b4a2d37dbb47940eaf2cc2e212f86 (patch) | |
| tree | 9dc89abc6d5816ae8ced5764124b50238eadce2b /src/common | |
| parent | 67c0ad54263be7fb742a8d499f97f5908f9ec970 (diff) | |
| parent | efcab439564dcadc5bc14609a9205d73d236e966 (diff) | |
| download | tor-e3c143f5214b4a2d37dbb47940eaf2cc2e212f86.tar.gz tor-e3c143f5214b4a2d37dbb47940eaf2cc2e212f86.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/address.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/address.c b/src/common/address.c index 29d4c0447e..8591f387e6 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -324,6 +324,8 @@ tor_addr_is_internal_(const tor_addr_t *addr, int for_listening, uint32_t iph4 = 0; uint32_t iph6[4]; sa_family_t v_family; + + tor_assert(addr); v_family = tor_addr_family(addr); if (v_family == AF_INET) { |