From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 3 Jun 2018 15:36:46 +0000 (+0900)
Subject: conf-parser: remove redundant utf8-validity check
X-Git-Tag: v239~161^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f106314c89b3247e7b8ef2ffca739a87d6e9cee0;p=thirdparty%2Fsystemd.git

conf-parser: remove redundant utf8-validity check
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 32a4249278c..0953355dce4 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -58,7 +58,6 @@
 #include "unit-name.h"
 #include "unit-printf.h"
 #include "user-util.h"
-#include "utf8.h"
 #include "web-util.h"
 
 static int supported_socket_protocol_from_string(const char *s) {
@@ -3829,11 +3828,6 @@ int config_parse_namespace_path_strv(
                         return 0;
                 }
 
-                if (!utf8_is_valid(word)) {
-                        log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, word);
-                        continue;
-                }
-
                 w = word;
                 if (startswith(w, "-")) {
                         ignore_enoent = true;
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 1057c59a110..8dc35d42065 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -688,11 +688,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();
 
@@ -777,12 +772,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 f0e3d6c07ea..aa6e4f1a953 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -171,7 +171,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) {