[or-cvs] r9546: backport: Stop crashing when the controller asks us to reset (in tor/branches/tor-0_1_1-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-02-10 02:06:34 -0500 (Sat, 10 Feb 2007)
New Revision: 9546

Modified:
   tor/branches/tor-0_1_1-patches/ChangeLog
   tor/branches/tor-0_1_1-patches/src/or/control.c
Log:
backport:
Stop crashing when the controller asks us to resetconf more than
one config option at once. (Vidalia 0.0.11 does this.)


Modified: tor/branches/tor-0_1_1-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_1-patches/ChangeLog	2007-02-10 07:04:46 UTC (rev 9545)
+++ tor/branches/tor-0_1_1-patches/ChangeLog	2007-02-10 07:06:34 UTC (rev 9546)
@@ -1,5 +1,7 @@
 Changes in version 0.1.1.27 - 2007-??-??
   o Major bugfixes:
+    - Stop crashing when the controller asks us to resetconf more than
+      one config option at once. (Vidalia 0.0.11 does this.)
     - Previously, we would cache up to 16 old networkstatus documents
       indefinitely, if they came from nontrusted authorities. Now we
       discard them if they are more than 10 days old.

Modified: tor/branches/tor-0_1_1-patches/src/or/control.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/control.c	2007-02-10 07:04:46 UTC (rev 9545)
+++ tor/branches/tor-0_1_1-patches/src/or/control.c	2007-02-10 07:06:34 UTC (rev 9546)
@@ -678,9 +678,9 @@
         ++eq;
       memcpy(outp, body, eq-body);
       outp += (eq-body);
-      *outp++ = ' ';
       body = eq+1;
       if (*eq == '=') {
+        *outp++ = ' ';
         if (*body != '\"') {
           while (!TOR_ISSPACE(*body))
             *outp++ = *body++;