mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Stop silently skipping invalid args to setevents

Browse source 
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".
This commit is contained in:
Roger Dingledine 2014-09-21 01:23:39 -04:00
parent e170205cd8
commit 1b40ea036f
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/bug13205 Normal file
View file

@ -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".

4
src/or/control.c
View file

@ -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;