conf-parser: fix wrong argument given to log_syntax_invalid_utf8

ronnychevalier · ronnychevalier · commit b4958f42af08 · 2017-05-14T13:19:11.000+02:00
The condition is on "word", hence we give word instead of rvalue.

An assert would be triggered if !utf8_is_valid(word) is true and
rvalue == NULL, since log_syntax_invalid_utf8 calls utf8_escape_invalid
which calls assert(str).

A test case has been added to test with valid and invalid utf8.
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
@@ -793,7 +793,7 @@ int config_parse_strv(const char *unit,
                 }
 
                 if (!utf8_is_valid(word)) {
-                        log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
+                        log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, word);
                         free(word);
                         continue;
                 }
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
@@ -180,6 +180,8 @@ static void test_config_parse_strv(void) {
         test_config_parse_strv_one("foo", STRV_MAKE("foo"));
         test_config_parse_strv_one("foo bar foo", STRV_MAKE("foo", "bar", "foo"));
         test_config_parse_strv_one("\"foo bar\" foo", STRV_MAKE("foo bar", "foo"));
+        test_config_parse_strv_one("\xc3\x80", STRV_MAKE("\xc3\x80"));
+        test_config_parse_strv_one("\xc3\x7f", STRV_MAKE_EMPTY);
 }
 
 static void test_config_parse_mode(void) {

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ int config_parse_strv(const char *unit,`
`793`	`793`	`}`
`794`	`794`
`795`	`795`	`if (!utf8_is_valid(word)) {`
`796`		`- log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);`
	`796`	`+ log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, word);`
`797`	`797`	`free(word);`
`798`	`798`	`continue;`
`799`	`799`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,8 @@ static void test_config_parse_strv(void) {`
`180`	`180`	`test_config_parse_strv_one("foo", STRV_MAKE("foo"));`
`181`	`181`	`test_config_parse_strv_one("foo bar foo", STRV_MAKE("foo", "bar", "foo"));`
`182`	`182`	`test_config_parse_strv_one("\"foo bar\" foo", STRV_MAKE("foo bar", "foo"));`
	`183`	`+ test_config_parse_strv_one("\xc3\x80", STRV_MAKE("\xc3\x80"));`
	`184`	`+ test_config_parse_strv_one("\xc3\x7f", STRV_MAKE_EMPTY);`
`183`	`185`	`}`
`184`	`186`
`185`	`187`	`static void test_config_parse_mode(void) {`