r13338@catbus: nickm | 2007-06-10 15:13:32 -0400

Fix bug in 10533: put "opt v" line at the end of a routerstatus section; overwriting is bad.


svn:r10549
This commit is contained in:
Nick Mathewson 2007-06-10 19:13:40 +00:00
parent 04995f197d
commit 932f2c79eb
2 changed files with 8 additions and 1 deletions

View File

@ -1655,9 +1655,10 @@ routerstatus_format_entry(char *buf, size_t buf_len,
log_warn(LD_BUG, "Not enough space in buffer.");
return -1;
}
cp += strlen(cp);
if (version) {
if (tor_snprintf(buf, buf_len, "opt v %s\n", version)<0) {
if (tor_snprintf(cp, buf_len - (cp-buf), "opt v %s\n", version)<0) {
log_warn(LD_BUG, "Unable to print router version.");
return -1;
}

View File

@ -2125,6 +2125,11 @@ test_dir_format(void)
"Tor 0.2.1.0-dev (r99)"));
}
static void
test_v3_networkstatus(void)
{
}
static void
test_policies(void)
{
@ -2412,6 +2417,7 @@ main(int c, char**v)
test_onion_handshake();
puts("\n========================= Directory Formats ===============");
test_dir_format();
test_v3_networkstatus();
puts("\n========================= Policies ===================");
test_policies();
puts("\n========================= Rendezvous functionality ========");