nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

scan-build: avoid undef behaior in tor_inet_pton

Browse Source 
If we had an address of the form "1.2.3.4" and we tried to pass it to
tor_inet_pton with AF_INET6, it was possible for our 'eow' pointer to
briefly move backwards to the point before the start of the string,
before we moved it right back to the start of the string.  C doesn't
allow that, and though we haven't yet hit a compiler that decided to
nuke us in response, it's best to fix.

So, be more explicit about requiring there to be a : before any IPv4
address part of the IPv6 address.  We would have rejected addresses
without a : for not being IPv6 later on anyway.
This commit is contained in:
Nick Mathewson 2014-04-19 13:07:30 -04:00
parent 78f555a248
commit 685d450ab3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/compat.c
View File

@ -2195,8 +2195,10 @@ tor_inet_pton(int af, const char *src, void *dst)
else { else {
unsigned byte1,byte2,byte3,byte4; unsigned byte1,byte2,byte3,byte4;
char more; char more;
for (eow = dot-1; eow >= src && TOR_ISDIGIT(*eow); --eow) for (eow = dot-1; eow > src && TOR_ISDIGIT(*eow); --eow)
; ;
if (*eow != ':')
return 0;
++eow; ++eow;
/* We use "scanf" because some platform inet_aton()s are too lax /* We use "scanf" because some platform inet_aton()s are too lax

3
src/test/test_addr.c
View File

@ -346,6 +346,9 @@ test_addr_ip6_helpers(void)
test_pton6_bad("a:::b:c"); test_pton6_bad("a:::b:c");
test_pton6_bad(":::a:b:c"); test_pton6_bad(":::a:b:c");
test_pton6_bad("a:b:c:::"); test_pton6_bad("a:b:c:::");
test_pton6_bad("1.2.3.4");
test_pton6_bad(":1.2.3.4");
test_pton6_bad(".2.3.4");
/* test internal checking */ /* test internal checking */
test_external_ip("fbff:ffff::2:7", 0); test_external_ip("fbff:ffff::2:7", 0);