Commit e61c6adf authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.2' into release-0.2.2

parents 6abb6389 0dc47dfe

changes/bug6094

0 → 100644
+8 −0
Original line number Diff line number Diff line 
  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.

src/or/control.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}