diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-01-06 14:28:02 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-01-06 14:28:02 -0500 |
commit | 3401c34151a29fe962944ce3ea77f14056c87efa (patch) | |
tree | a251d325f815009844762340fb6cba871e7ae805 /src/or/control.c | |
parent | a034863b45455a2def6d957d54bec2530db4a1a6 (diff) | |
parent | 6d6643298dfda1b146c635e3858faec7e9c9631c (diff) | |
download | tor-3401c34151a29fe962944ce3ea77f14056c87efa.tar.gz tor-3401c34151a29fe962944ce3ea77f14056c87efa.zip |
Merge remote-tracking branch 'public/bug14116_025'
Diffstat (limited to 'src/or/control.c')
-rw-r--r-- | src/or/control.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index d21682a19c..3dbaa1bdf2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -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)); |