summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-02-10 07:04:46 +0000
committerRoger Dingledine <arma@torproject.org>2007-02-10 07:04:46 +0000
commit01ddb05fba01b8bf5f9f48514ef17ec77594ac85 (patch)
treec5f47c7dec682bf575b2af5bfcd7dd7d76f285a3 /src
parentb3d91d72b835f0458381ebcfb06a2ece93a1c269 (diff)
downloadtor-01ddb05fba01b8bf5f9f48514ef17ec77594ac85.tar.gz
tor-01ddb05fba01b8bf5f9f48514ef17ec77594ac85.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/or/control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 46d873b961..42b04b6dd3 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -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++;