torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.8' into maint-0.2.9

Browse Source
This commit is contained in:
Nick Mathewson
2017-07-05 13:43:21 -04:00
parent bb97f680e7 5ff0f1ab9e
commit 32c0066e4b
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/compat.c
+6 -2
View File
@@ -2579,8 +2579,12 @@ tor_inet_pton(int af, const char *src, void *dst)
char *next;
ssize_t len;
long r = strtol(src, &next, 16);
tor_assert(next != NULL);
tor_assert(next != src);
if (next == NULL || next == src) {
/* The 'next == src' error case can happen on versions of openbsd
* where treats "0xfoo" as an error, rather than as "0" followed by
* "xfoo". */
return 0;
}
len = *next == '\0' ? eow - src : next - src;
if (len > 4)