diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-12 09:51:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-09-12 09:51:04 -0400 |
| commit | 0327f9a0757e202666ec54460a69303633af4b33 (patch) | |
| tree | f1ab5e087e8fb3846eea8a3f1f6df5cdc9972784 | |
| parent | 896a1ac50b6ab182c1e15cc5271d0b24fcb90a31 (diff) | |
| parent | 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 (diff) | |
| download | tor-0327f9a0757e202666ec54460a69303633af4b33.tar.gz tor-0327f9a0757e202666ec54460a69303633af4b33.zip | |
Merge branch 'ticket31687_035' into ticket31687_040
| -rw-r--r-- | changes/ticket31687_1 | 4 | ||||
| -rw-r--r-- | changes/ticket31687_2 | 5 | ||||
| -rw-r--r-- | src/core/or/connection_edge.c | 7 | ||||
| -rw-r--r-- | src/lib/math/fp.c | 6 |
4 files changed, 19 insertions, 3 deletions
diff --git a/changes/ticket31687_1 b/changes/ticket31687_1 new file mode 100644 index 0000000000..2f4d440974 --- /dev/null +++ b/changes/ticket31687_1 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Suppress spurious float-conversion warnings from GCC when calling + floating-point classifier functions on FreeBSD. Fixes part of bug + 31687; bugfix on 0.3.1.5-alpha. diff --git a/changes/ticket31687_2 b/changes/ticket31687_2 new file mode 100644 index 0000000000..eadc698275 --- /dev/null +++ b/changes/ticket31687_2 @@ -0,0 +1,5 @@ + o Minor bugfixes (FreeBSD, PF-based proxy, IPv6): + - When extracting an IPv6 address from a PF-based proxy, verify + that we are actually configured to receive an IPv6 address, + and log an internal error if not. Fixes part of bug 31687; + bugfix on 0.2.3.4-alpha. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index cc240bdc98..085c641859 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2559,8 +2559,11 @@ destination_from_pf(entry_connection_t *conn, socks_request_t *req) } else if (proxy_sa->sa_family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)proxy_sa; pnl.af = AF_INET6; - memcpy(&pnl.saddr.v6, tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr), - sizeof(struct in6_addr)); + const struct in6_addr *dest_in6 = + tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr); + if (BUG(!dest_in6)) + return -1; + memcpy(&pnl.saddr.v6, dest_in6, sizeof(struct in6_addr)); pnl.sport = htons(ENTRY_TO_CONN(conn)->port); memcpy(&pnl.daddr.v6, &sin6->sin6_addr, sizeof(struct in6_addr)); pnl.dport = sin6->sin6_port; diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c index 52c57c1d7f..9d93eaa878 100644 --- a/src/lib/math/fp.c +++ b/src/lib/math/fp.c @@ -62,12 +62,16 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(MINGW_ANY) && GCC_VERSION >= 409 +#if (defined(MINGW_ANY)||defined(__FreeBSD__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. + + FreeBSD's math.h uses an __fp_type_select() macro, which dispatches + based on sizeof -- again, this can generate type warnings from + branches that are not taken. */ #define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) |