Commit 01ddb05f authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Stop crashing when the controller asks us to resetconf more than 

one config option at once. (Vidalia 0.0.11 does this.)
Backport candidate.


svn:r9545
parent b3d91d72

ChangeLog

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ Changes in version 0.1.2.8-alpha - 2007-??-?? 
    - When we start during an accounting interval before it's time to wake

      up, remember to wake up at the correct time. (May fix bug 342.)



  o Major bugfixes (crashes):

    - Stop crashing when the controller asks us to resetconf more than

      one config option at once. (Vidalia 0.0.11 does this.)



  o Minor bugfixes (controller):

    - Give the controller END_STREAM_REASON_DESTROY events _before_ we

      clear the corresponding on_circuit variable, and remember later that

src/or/control.c

+1 −1
Original line number Diff line number Diff line
@@ -810,9 +810,9 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body, 
        ++eq;

      memcpy(outp, body, eq-body);

      outp += (eq-body);

      *outp++ = ' ';

      body = eq+1;

      if (*eq == '=') {

        *outp++ = ' ';

        if (*body != '\"') {

          while (!TOR_ISSPACE(*body))

            *outp++ = *body++;