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

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-07 09:46:14 -04:00
commit 99618a9641
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug6094 Normal file
View File

@ -0,0 +1,8 @@
o Major bugfixes:
- Send a CRLF at the end of each STATUS_* control-port event. A
change introduced in 0.2.3.16-alpha caused Tor to emit the CRLF
in the middle of a STATUS_* event; among other things, this
caused Vidalia to freeze. Fixes bug 6094; bugfix on
0.2.3.16-alpha.

4
src/or/control.c
View File

@ -4254,14 +4254,14 @@ control_event_status(int type, int severity, const char *format, va_list args)
log_warn(LD_BUG, "Unrecognized status severity %d", severity); log_warn(LD_BUG, "Unrecognized status severity %d", severity);
return -1; return -1;
} }
if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s\r\n", if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s",
status, sev)<0) { status, sev)<0) {
log_warn(LD_BUG, "Format string too long."); log_warn(LD_BUG, "Format string too long.");
return -1; return -1;
} }
tor_vasprintf(&user_buf, format, args); tor_vasprintf(&user_buf, format, args);
send_control_event(type, ALL_FORMATS, "%s %s", format_buf, user_buf); send_control_event(type, ALL_FORMATS, "%s %s\r\n", format_buf, user_buf);
tor_free(user_buf); tor_free(user_buf);
return 0; return 0;
} }