Commit 1b40ea03 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

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".
parent e170205c

changes/bug13205

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

src/or/control.c

+3 −1
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ static int 
handle_control_setevents(control_connection_t *conn, uint32_t len,

                         const char *body)

{

  int event_code = -1;

  int event_code;

  event_mask_t event_mask = 0;

  smartlist_t *events = smartlist_new();
@@ -963,6 +963,8 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, 
        continue;

      } else {

        int i;

        event_code = -1;



        for (i = 0; control_event_table[i].event_name != NULL; ++i) {

          if (!strcasecmp(ev, control_event_table[i].event_name)) {

            event_code = control_event_table[i].event_code;