Fix a boolean logic error when logging about invalid hostnames.

Fixes bug 34131; bugfix on 0.4.3.1-alpha.
This commit is contained in:
Nick Mathewson 2020-05-06 17:15:37 -04:00
parent b7fcbb28d4
commit b444096be5
2 changed files with 8 additions and 2 deletions

4
changes/bug34131 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (logging):
- Fix a logic error in a log message about whether an address was
invalid. Previously, the code would never report that onion addresses
were onion addresses. Fixes bug 34131; bugfix on 0.4.3.1-alpha.

View File

@ -1643,9 +1643,11 @@ parse_extended_hostname(char *address, hostname_type_t *type_out)
failed:
/* otherwise, return to previous state and return 0 */
*s = '.';
const bool is_onion = (*type_out == ONION_V2_HOSTNAME) ||
(*type_out == ONION_V3_HOSTNAME);
log_warn(LD_APP, "Invalid %shostname %s; rejecting",
(*type_out == (ONION_V2_HOSTNAME || ONION_V3_HOSTNAME) ? "onion " : ""),
safe_str_client(address));
is_onion ? "onion " : "",
safe_str_client(address));
return false;
}