Explorar o código

Stop silently skipping invalid args to setevents

Return an error when the second or later arguments of the
"setevents" controller command are invalid events. Previously we
would return success while silently skipping invalid events.

Fixes bug 13205; bugfix on 0.2.3.2-alpha. Reported by "fpxnns".
Roger Dingledine %!s(int64=9) %!d(string=hai) anos
pai
achega
1b40ea036f
Modificáronse 2 ficheiros con 8 adicións e 1 borrados
  1. 5 0
      changes/bug13205
  2. 3 1
      src/or/control.c

+ 5 - 0
changes/bug13205

@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Return an error when the second or later arguments of the
+      "setevents" controller command are invalid events. Previously we
+      would return success while silently skipping invalid events. Fixes
+      bug 13205; bugfix on 0.2.3.2-alpha. Reported by "fpxnns".

+ 3 - 1
src/or/control.c

@@ -949,7 +949,7 @@ static int
 handle_control_setevents(control_connection_t *conn, uint32_t len,
 handle_control_setevents(control_connection_t *conn, uint32_t len,
                          const char *body)
                          const char *body)
 {
 {
-  int event_code = -1;
+  int event_code;
   event_mask_t event_mask = 0;
   event_mask_t event_mask = 0;
   smartlist_t *events = smartlist_new();
   smartlist_t *events = smartlist_new();
 
 
@@ -963,6 +963,8 @@ handle_control_setevents(control_connection_t *conn, uint32_t len,
         continue;
         continue;
       } else {
       } else {
         int i;
         int i;
+        event_code = -1;
+
         for (i = 0; control_event_table[i].event_name != NULL; ++i) {
         for (i = 0; control_event_table[i].event_name != NULL; ++i) {
           if (!strcasecmp(ev, control_event_table[i].event_name)) {
           if (!strcasecmp(ev, control_event_table[i].event_name)) {
             event_code = control_event_table[i].event_code;
             event_code = control_event_table[i].event_code;