mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-24 14:51:11 +01:00
change INET_NTOA_BUF_LEN+1 to INET_NTOA_BUF_LEN
add a comment in a few places where we add weird numbers to buffer lengths svn:r6161
This commit is contained in:
parent
de5fac0ed1
commit
a4ec555228
6 changed files with 8 additions and 9 deletions
|
@ -338,7 +338,7 @@ circuit_handle_first_hop(circuit_t *circ)
|
|||
{
|
||||
crypt_path_t *firsthop;
|
||||
connection_t *n_conn;
|
||||
char tmpbuf[INET_NTOA_BUF_LEN+1];
|
||||
char tmpbuf[INET_NTOA_BUF_LEN];
|
||||
struct in_addr in;
|
||||
|
||||
firsthop = onion_next_hop_in_cpath(circ->cpath);
|
||||
|
|
|
@ -718,9 +718,9 @@ client_dns_set_addressmap(const char *address, uint32_t val,
|
|||
int ttl)
|
||||
{
|
||||
struct in_addr in;
|
||||
char extendedaddress[MAX_SOCKS_ADDR_LEN+MAX_HEX_NICKNAME_LEN+10];
|
||||
char extendedaddress[MAX_SOCKS_ADDR_LEN+MAX_HEX_NICKNAME_LEN+10]; /* <address>.<hex or nickname>.exit\0 or just <address>\0 */
|
||||
char valbuf[INET_NTOA_BUF_LEN];
|
||||
char extendedval[INET_NTOA_BUF_LEN+MAX_HEX_NICKNAME_LEN+10];
|
||||
char extendedval[INET_NTOA_BUF_LEN+MAX_HEX_NICKNAME_LEN+10]; /* 123.123.123.123.<hex or nickname>.exit\0 or just 123.123.123.123\0 */
|
||||
|
||||
tor_assert(address); tor_assert(val);
|
||||
|
||||
|
|
|
@ -1310,7 +1310,7 @@ generate_v2_networkstatus(void)
|
|||
char *outp, *endp;
|
||||
or_options_t *options = get_options();
|
||||
char fingerprint[FINGERPRINT_LEN+1];
|
||||
char ipaddr[INET_NTOA_BUF_LEN+1];
|
||||
char ipaddr[INET_NTOA_BUF_LEN];
|
||||
char published[ISO_TIME_LEN+1];
|
||||
char digest[DIGEST_LEN];
|
||||
struct in_addr in;
|
||||
|
|
|
@ -314,7 +314,7 @@ rend_valid_service_id(const char *query)
|
|||
int
|
||||
rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e)
|
||||
{
|
||||
char key[REND_SERVICE_ID_LEN+2];
|
||||
char key[REND_SERVICE_ID_LEN+2]; /* 1<query>\0 or 0<query>\0 */
|
||||
tor_assert(rend_cache);
|
||||
if (!rend_valid_service_id(query))
|
||||
return -1;
|
||||
|
@ -366,7 +366,7 @@ rend_cache_store(const char *desc, size_t desc_len)
|
|||
rend_cache_entry_t *e;
|
||||
rend_service_descriptor_t *parsed;
|
||||
char query[REND_SERVICE_ID_LEN+1];
|
||||
char key[REND_SERVICE_ID_LEN+2];
|
||||
char key[REND_SERVICE_ID_LEN+2]; /* 1<query>\0 or 0<query>\0 */
|
||||
time_t now;
|
||||
|
||||
tor_assert(rend_cache);
|
||||
|
|
|
@ -244,8 +244,7 @@ init_keys(void)
|
|||
char keydir[512];
|
||||
char keydir2[512];
|
||||
char fingerprint[FINGERPRINT_LEN+1];
|
||||
/*nickname fp\n\0 */
|
||||
char fingerprint_line[FINGERPRINT_LEN+MAX_NICKNAME_LEN+3];
|
||||
char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3]; /*nickname<space>fp\n\0 */
|
||||
char *cp;
|
||||
const char *mydesc, *datadir;
|
||||
crypto_pk_env_t *prkey;
|
||||
|
|
|
@ -2252,7 +2252,7 @@ update_networkstatus_cache_downloads(time_t now)
|
|||
/* An authority launches a separate connection for everybody. */
|
||||
SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ds,
|
||||
{
|
||||
char resource[HEX_DIGEST_LEN+6];
|
||||
char resource[HEX_DIGEST_LEN+6]; /* fp/hexdigit.z\0 */
|
||||
if (router_digest_is_me(ds->digest))
|
||||
continue;
|
||||
if (connection_get_by_type_addr_port_purpose(
|
||||
|
|
Loading…
Add table
Reference in a new issue