From b03837e962f32114283c27bf40af7fc4c25fe3cd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 4 Jun 2018 00:36:46 +0900 Subject: conf-parser: remove redundant utf8-validity check --- src/shared/conf-parser.c | 12 +----------- src/test/test-conf-parser.c | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 96bcddb4f..a43e595cc 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -45,6 +45,7 @@ //#include "rlimit-util.h" //#include "rlimit-util.h" //#include "rlimit-util.h" +//#include "rlimit-util.h" int config_item_table_lookup( const void *table, @@ -709,11 +710,6 @@ int config_parse_string( assert(rvalue); assert(data); - if (!utf8_is_valid(rvalue)) { - log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue); - return 0; - } - if (free_and_strdup(s, empty_to_null(rvalue)) < 0) return log_oom(); @@ -798,12 +794,6 @@ int config_parse_strv( break; } - if (!utf8_is_valid(word)) { - log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, word); - free(word); - continue; - } - r = strv_consume(sv, word); if (r < 0) return log_oom(); diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index b95aa7a22..0e531bb21 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -185,7 +185,7 @@ static void test_config_parse_strv(void) { 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); + test_config_parse_strv_one("\xc3\x7f", STRV_MAKE("\xc3\x7f")); } static void test_config_parse_mode(void) { -- cgit v1.2.3