clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-04 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not print invalid UTF-8 in error messages

Browse Source 
Inexplicably, 550a40ec ('core: do not print invalid utf-8 in error
messages') only fixed two paths. Convert all of them now.

(cherry picked from commit b5d742138f)

Conflicts:
	src/core/load-fragment.c
	src/shared/conf-parser.c
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-03-07 00:42:58 -05:00
parent 191479e0e4
commit 799f37dd06
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/load-fragment.c
+3 -8
View File
@@ -535,9 +535,7 @@ int config_parse_exec(const char *unit,
}
if (!utf8_is_valid(path)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Path is not UTF-8 clean, ignoring assignment: %s",
rvalue);
log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue);
r = 0;
goto fail;
}
@@ -552,9 +550,7 @@ int config_parse_exec(const char *unit,
}
if (!utf8_is_valid(c)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Path is not UTF-8 clean, ignoring assignment: %s",
rvalue);
log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue);
r = 0;
goto fail;
}
@@ -1959,8 +1955,7 @@ int config_parse_unit_requires_mounts_for(
return log_oom();
if (!utf8_is_valid(n)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Path is not UTF-8 clean, ignoring assignment: %s", rvalue);
log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue);
continue;
}
src/shared/conf-parser.c
+2 -4
View File
@@ -656,8 +656,7 @@ int config_parse_path(const char *unit,
assert(data);
if (!utf8_is_valid(rvalue)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Path is not UTF-8 clean, ignoring assignment: %s", rvalue);
log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue);
return 0;
}
@@ -725,8 +724,7 @@ int config_parse_strv(const char *unit,
return log_oom();
if (!utf8_is_valid(n)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"String is not UTF-8 clean, ignoring: %s", rvalue);
log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue);
continue;
}
src/shared/conf-parser.h
+6
View File
@@ -124,6 +124,12 @@ int log_syntax_internal(const char *unit, int level,
config_file, config_line, \
error, __VA_ARGS__)
#define log_invalid_utf8(unit, level, config_file, config_line, error, rvalue) { \
_cleanup_free_ char *__p = utf8_escape_invalid(rvalue); \
log_syntax(unit, level, config_file, config_line, error, \
"String is not UTF-8 clean, ignoring assignment: %s", __p); \
}
#define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg) \
int function(const char *unit, \
const char *filename, \
src/shared/fileio.c
+6 -3
View File
@@ -598,15 +598,18 @@ static int load_env_file_push(const char *filename, unsigned line,
int r;
if (!utf8_is_valid(key)) {
_cleanup_free_ char *t = utf8_escape_invalid(key);
log_error("%s:%u: invalid UTF-8 for key '%s', ignoring.",
filename, line, key);
filename, line, t);
return -EINVAL;
}
if (value && !utf8_is_valid(value)) {
/* FIXME: filter UTF-8 */
_cleanup_free_ char *t = utf8_escape_invalid(value);
log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.",
filename, line, key, value);
filename, line, key, t);
return -EINVAL;
}