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

handle_control_getinfo() was counting msg_len itself,

Browse Source 
when that's actually smartlist_join_strings2()'s job.


svn:r3806
This commit is contained in:
Roger Dingledine 2005-03-22 05:41:05 +00:00
parent 248867caf5
commit 76a03e8635
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/control.c
View File

@ -589,7 +589,6 @@ handle_control_getinfo(connection_t *conn, uint32_t len, const char *body)
smartlist_split_string(questions, body, "\n",
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
answers = smartlist_create();
msg_len = 0;
SMARTLIST_FOREACH(questions, const char *, q,
{
if (handle_getinfo_helper(q, &ans) < 0) {
@ -601,12 +600,12 @@ handle_control_getinfo(connection_t *conn, uint32_t len, const char *body)
}
smartlist_add(answers, tor_strdup(q));
smartlist_add(answers, ans);
msg_len += 2 + strlen(ans) + strlen(q);
});
msg = smartlist_join_strings2(answers, "\0", 1, 1, &msg_len);
tor_assert(msg_len > 0); /* it will at least be terminated */
send_control_message(conn, CONTROL_CMD_INFOVALUE,
msg_len, msg_len?msg:NULL);
msg_len, msg);
done:
if (answers) SMARTLIST_FOREACH(answers, char *, cp, tor_free(cp));