[tor-commits] [tor/master] addr: Remove BUG() that always triggers
nickm at torproject.org
nickm at torproject.org
Fri Jul 10 17:20:20 UTC 2020
commit 401b3a8a3c823c6d0642cc323464e05a140f0351
Author: David Goulet <dgoulet at torproject.org>
Date: Fri Jul 10 13:09:46 2020 -0400
addr: Remove BUG() that always triggers
Fix on unreleased code.
Logical || in the BUG() made it that it would always trigger the BUG().
Fixes #40034
Signed-off-by: David Goulet <dgoulet at torproject.org>
---
src/app/config/resolve_addr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c
index 172f69854..7ec5ae565 100644
--- a/src/app/config/resolve_addr.c
+++ b/src/app/config/resolve_addr.c
@@ -85,7 +85,7 @@ resolved_addr_get_suggested(int family, tor_addr_t *addr_out)
void
resolved_addr_set_suggested(const tor_addr_t *addr)
{
- if (BUG(tor_addr_family(addr) != AF_INET ||
+ if (BUG(tor_addr_family(addr) != AF_INET &&
tor_addr_family(addr) != AF_INET6)) {
return;
}
More information about the tor-commits
mailing list