Commit ab78a4df authored by paolo.ingls@gmail.com's avatar paolo.ingls@gmail.com Committed by Nick Mathewson
Browse files

torrc parsing b0rks on carriage-return

(Specifically, carriage return after a quoted value in a config
line. Fixes bug 19167; bugfix on 0.2.0.16-alpha when we introduced
support for quoted values. Unit tests, changes file, and this
parenthetical by nickm.)
parent 33286587
o Minor bugfixes (configuration):
- When parsing quoted configuration values from the torrc file,
handle windows line endings correctly. Fixes bug 19167; bugfix on
0.2.0.16-alpha. Patch from "Pingl".
......@@ -3079,6 +3079,8 @@ parse_config_line_from_str_verbose(const char *line, char **key_out,
}
while (*line == ' ' || *line == '\t')
++line;
if (*line == '\r' && *(++line) == '\n')
++line;
if (*line && *line != '#' && *line != '\n') {
if (err_out)
*err_out = "Excess data after quoted string";
......
......@@ -1642,6 +1642,36 @@ test_util_config_line_escaped_content(void *arg)
tor_free(v);
}
static void
test_util_config_line_crlf(void *arg)
{
char *k=NULL, *v=NULL;
const char *err = NULL;
(void)arg;
const char *str =
"Hello world\r\n"
"Hello \"nice big world\"\r\n";
str = parse_config_line_from_str_verbose(str, &k, &v, &err);
tt_assert(str);
tt_str_op(k,OP_EQ,"Hello");
tt_str_op(v,OP_EQ,"world");
tt_assert(!err);
tor_free(k); tor_free(v);
str = parse_config_line_from_str_verbose(str, &k, &v, &err);
tt_assert(str);
tt_str_op(k,OP_EQ,"Hello");
tt_str_op(v,OP_EQ,"nice big world");
tt_assert(!err);
tor_free(k); tor_free(v);
tt_str_op(str,OP_EQ, "");
done:
tor_free(k); tor_free(v);
}
#ifndef _WIN32
static void
test_util_expand_filename(void *arg)
......@@ -5609,6 +5639,7 @@ struct testcase_t util_tests[] = {
UTIL_LEGACY(config_line_quotes),
UTIL_LEGACY(config_line_comment_character),
UTIL_LEGACY(config_line_escaped_content),
UTIL_LEGACY(config_line_crlf),
UTIL_LEGACY_NO_WIN(expand_filename),
UTIL_LEGACY(escape_string_socks),
UTIL_LEGACY(string_is_key_value),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment