small code tweaks to try to work around debian stable complaints

This commit is contained in:
Nick Mathewson 2020-08-10 17:36:21 -04:00
parent 057f40f3d8
commit e873c7e893
2 changed files with 3 additions and 3 deletions

View File

@ -261,8 +261,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
> MAX_NICKNAME_LEN)) {
goto perm_err;
}
strncpy(tmp, rendcirc->build_state->chosen_exit->nickname,
(MAX_NICKNAME_LEN+1)); /* nul pads */
strlcpy(tmp, rendcirc->build_state->chosen_exit->nickname,
sizeof(tmp));
memcpy(tmp+MAX_NICKNAME_LEN+1, rendcirc->rend_data->rend_cookie,
REND_COOKIE_LEN);
dh_offset = MAX_NICKNAME_LEN+1+REND_COOKIE_LEN;

View File

@ -337,7 +337,7 @@ tor_addr_to_str(char *dest, const tor_addr_t *addr, size_t len, int decorate)
break;
case AF_INET6:
/* Shortest addr [ :: ] + \0 */
if (len < (3 + (decorate ? 2 : 0)))
if (len < (3 + (decorate ? 2u : 0u)))
return NULL;
if (decorate)