nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

r13689@catbus: nickm | 2007-07-10 17:46:30 -0400

Browse Source 
tweaks to last patch.  from croup.


svn:r10787
This commit is contained in:
Nick Mathewson 2007-07-10 21:46:33 +00:00
parent 7e20fdbefb
commit fa1376014b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/routerparse.c
View File

@ -2365,7 +2365,7 @@ get_next_token(const char **s, const char *eos, token_rule_t *table)
tok->tp = _ERR; tok->tp = _ERR;
*s = eat_whitespace_eos(*s, eos); *s = eat_whitespace_eos(*s, eos);
if (!**s) { if (*s == eos) {
tok->tp = _EOF; tok->tp = _EOF;
return tok; return tok;
} }
@ -2377,10 +2377,8 @@ get_next_token(const char **s, const char *eos, token_rule_t *table)
if (!strncmp("opt", *s, next-*s)) { if (!strncmp("opt", *s, next-*s)) {
/* Skip past an "opt" at the start of the line. */ /* Skip past an "opt" at the start of the line. */
*s = eat_whitespace_eos(next, eos); *s = eat_whitespace_eos(next, eos);
next = NULL; next = find_whitespace_eos(*s, eos);
if (**s) if (!next) {
next = find_whitespace_eos(*s, eos);
if (!**s || !next) {
RET_ERR("opt without keyword"); RET_ERR("opt without keyword");
} }
} }