Merge remote-tracking branch 'public/bug14116_025'

This commit is contained in:
Nick Mathewson 2015-01-06 14:28:02 -05:00
commit 3401c34151
2 changed files with 11 additions and 0 deletions

3
changes/bug14116_025 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (controller):
- Avoid crashing on a malformed EXTENDCIRCUIT command. Fixes bug 14116;
bugfix on 0.2.2.9-alpha.

View File

@ -2465,6 +2465,14 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len,
goto done;
}
if (smartlist_len(args) < 2) {
connection_printf_to_buf(conn,
"512 syntax error: not enough arguments.\r\n");
SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));
smartlist_free(args);
goto done;
}
smartlist_split_string(router_nicknames, smartlist_get(args,1), ",", 0, 0);
SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));