diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-19 08:03:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-19 08:03:17 -0500 |
| commit | f9f1e3c94b6758e794abac8517474515101a6fd3 (patch) | |
| tree | 2e18ec06c5c992e8c4be8680ea1c0786637e0f6d /src/or/parsecommon.c | |
| parent | 2dc522664420163eeea87b8a5bdab5eaabd9b2e2 (diff) | |
| parent | de656474611c43f24dd5fff430de945b34b738bf (diff) | |
| download | tor-f9f1e3c94b6758e794abac8517474515101a6fd3.tar.gz tor-f9f1e3c94b6758e794abac8517474515101a6fd3.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'src/or/parsecommon.c')
| -rw-r--r-- | src/or/parsecommon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/parsecommon.c b/src/or/parsecommon.c index 6622d7d671..ec2cec69f7 100644 --- a/src/or/parsecommon.c +++ b/src/or/parsecommon.c @@ -326,7 +326,7 @@ get_next_token(memarea_t *area, if (tok->tp == ERR_) { /* No keyword matched; call it an "K_opt" or "A_unrecognized" */ - if (**s == '@') + if (*s < eol && **s == '@') tok->tp = A_UNKNOWN_; else tok->tp = K_OPT; |