diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-12 13:44:57 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-12 13:44:57 -0500 |
| commit | 9b11dc36179e48bd39e57a9f3e0e26a25f50adfa (patch) | |
| tree | bac57730fde53f72349a7cf81145ddcb4b417d5b /src/common | |
| parent | 4ac5175109b14f8fafca3374ab5ca63968ab2cca (diff) | |
| parent | ecd16edafe5afbf00c5775d9f41457d4b015dc2c (diff) | |
| download | tor-9b11dc36179e48bd39e57a9f3e0e26a25f50adfa.tar.gz tor-9b11dc36179e48bd39e57a9f3e0e26a25f50adfa.zip | |
Merge remote-tracking branch 'public/bug7484'
Conflicts:
src/test/test_addr.c
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/address.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/address.c b/src/common/address.c index de5d3a6ff7..a3b5df66bc 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -723,6 +723,11 @@ tor_addr_parse_mask_ports(const char *s, /* XXXX_IP6 is this really what we want? */ bits = 96 + bits%32; /* map v4-mapped masks onto 96-128 bits */ } + if (any_flag) { + log_warn(LD_GENERAL, + "Found bit prefix with wildcard address; rejecting"); + goto err; + } } else { /* pick an appropriate mask, as none was given */ if (any_flag) bits = 0; /* This is okay whether it's V6 or V4 (FIX V4-mapped V6!) */ |