diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-01-17 21:28:41 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-02-08 13:07:39 -0500 |
| commit | 550a40eceb7d1917152fc9317bf2696708d52bc2 (patch) | |
| tree | 929a5bac5264ad95783b1a68897daa67e3a25428 /src/shared/fileio.c | |
| parent | cda7ecb0a3d6cf839ec484a6690c12857a6e8375 (diff) | |
core: do not print invalid utf-8 in error messages
Diffstat (limited to 'src/shared/fileio.c')
| -rw-r--r-- | src/shared/fileio.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/shared/fileio.c b/src/shared/fileio.c index 838d128433..b81eeb272a 100644 --- a/src/shared/fileio.c +++ b/src/shared/fileio.c @@ -539,15 +539,18 @@ static int parse_env_file_push(const char *filename, unsigned line, va_list aq, *ap = userdata; if (!utf8_is_valid(key)) { - log_error("%s:%u: invalid UTF-8 for key '%s', ignoring.", - filename, line, key); + _cleanup_free_ char *p = utf8_escape_invalid(key); + + log_error("%s:%u: invalid UTF-8 in key '%s', ignoring.", + filename, line, p); return -EINVAL; } if (value && !utf8_is_valid(value)) { - /* FIXME: filter UTF-8 */ + _cleanup_free_ char *p = utf8_escape_invalid(value); + log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.", - filename, line, key, value); + filename, line, key, p); return -EINVAL; } |