nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check snprintf return values in format_networkstatus_vote.

Browse Source 
Maybe this is what parakeep was complaining about? Really wish he
would stick around more. Playing these guessing games is not fun :(
This commit is contained in:
Mike Perry 2010-02-25 11:59:35 -08:00
parent 50d6960332
commit 215930a7de
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/or/dirvote.c
View File

@ -78,6 +78,7 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
uint32_t addr; uint32_t addr;
routerlist_t *rl = router_get_routerlist(); routerlist_t *rl = router_get_routerlist();
char *version_lines = NULL; char *version_lines = NULL;
int r;
networkstatus_voter_info_t *voter; networkstatus_voter_info_t *voter;
tor_assert(private_signing_key); tor_assert(private_signing_key);
@ -104,13 +105,22 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
version_lines = tor_malloc(v_len); version_lines = tor_malloc(v_len);
cp = version_lines; cp = version_lines;
if (client_versions) { if (client_versions) {
tor_snprintf(cp, v_len-(cp-version_lines), r = tor_snprintf(cp, v_len-(cp-version_lines),
"client-versions %s\n", client_versions); "client-versions %s\n", client_versions);
if (r < 0) {
log_err(LD_BUG, "Insufficient memory for client-versions line");
tor_assert(0);
}
cp += strlen(cp); cp += strlen(cp);
} }
if (server_versions) if (server_versions) {
tor_snprintf(cp, v_len-(cp-version_lines), r = tor_snprintf(cp, v_len-(cp-version_lines),
"server-versions %s\n", server_versions); "server-versions %s\n", server_versions);
if (r < 0) {
log_err(LD_BUG, "Insufficient memory for server-versions line");
tor_assert(0);
}
}
} else { } else {
version_lines = tor_strdup(""); version_lines = tor_strdup("");
} }
@ -143,7 +153,7 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
params = tor_strdup(""); params = tor_strdup("");
tor_assert(cert); tor_assert(cert);
tor_snprintf(status, len, r = tor_snprintf(status, len,
"network-status-version 3\n" "network-status-version 3\n"
"vote-status %s\n" "vote-status %s\n"
"consensus-methods %s\n" "consensus-methods %s\n"
@ -167,6 +177,11 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
voter->nickname, fingerprint, voter->address, voter->nickname, fingerprint, voter->address,
ipaddr, voter->dir_port, voter->or_port, voter->contact); ipaddr, voter->dir_port, voter->or_port, voter->contact);
if (r < 0) {
log_err(LD_BUG, "Insufficient memory for network status line");
tor_assert(0);
}
tor_free(params); tor_free(params);
tor_free(flags); tor_free(flags);
tor_free(methods); tor_free(methods);
@ -176,7 +191,11 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
if (!tor_digest_is_zero(voter->legacy_id_digest)) { if (!tor_digest_is_zero(voter->legacy_id_digest)) {
char fpbuf[HEX_DIGEST_LEN+1]; char fpbuf[HEX_DIGEST_LEN+1];
base16_encode(fpbuf, sizeof(fpbuf), voter->legacy_id_digest, DIGEST_LEN); base16_encode(fpbuf, sizeof(fpbuf), voter->legacy_id_digest, DIGEST_LEN);
tor_snprintf(outp, endp-outp, "legacy-dir-key %s\n", fpbuf); r = tor_snprintf(outp, endp-outp, "legacy-dir-key %s\n", fpbuf);
if (r < 0) {
log_err(LD_BUG, "Insufficient memory for legacy-dir-key line");
tor_assert(0);
}
outp += strlen(outp); outp += strlen(outp);
} }
@ -207,7 +226,11 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
} }
} SMARTLIST_FOREACH_END(vrs); } SMARTLIST_FOREACH_END(vrs);
tor_snprintf(outp, endp-outp, "directory-footer\n"); r = tor_snprintf(outp, endp-outp, "directory-footer\n");
if (r < 0) {
log_err(LD_BUG, "Insufficient memory for directory-footer line");
tor_assert(0);
}
outp += strlen(outp); outp += strlen(outp);
{ {