[tor-commits] [tor/master] Send a CRLF at the end of a STATUS_* event, not in the middle of it

[nickm at torproject.org]

commit 0dc47dfebffe9547bc95ba3f2a64fc5f4b15f270
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Thu Jun 7 03:22:06 2012 +0000

    Send a CRLF at the end of a STATUS_* event, not in the middle of it
    
    Fixes bug 6094; bugfix on commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f.
---
 changes/bug6094  |    8 ++++++++
 src/or/control.c |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changes/bug6094 b/changes/bug6094
new file mode 100644
index 0000000..835d127
--- /dev/null
+++ b/changes/bug6094
@@ -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.
+
diff --git a/src/or/control.c b/src/or/control.c
index 8aa4240..782468f 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3957,14 +3957,14 @@ control_event_status(int type, int severity, const char *format, va_list args)
       log_warn(LD_BUG, "Unrecognized status severity %d", severity);
       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) {
     log_warn(LD_BUG, "Format string too long.");
     return -1;
   }
   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);
   return 0;
 }