summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-01-17 21:28:41 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-08 13:07:39 -0500
commit550a40eceb7d1917152fc9317bf2696708d52bc2 (patch)
tree929a5bac5264ad95783b1a68897daa67e3a25428 /src/shared
parentcda7ecb0a3d6cf839ec484a6690c12857a6e8375 (diff)
core: do not print invalid utf-8 in error messages
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/fileio.c11
-rw-r--r--src/shared/utf8.c26
-rw-r--r--src/shared/utf8.h3
3 files changed, 36 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;
}
diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index 6e5ba9abf4..0b524d8a90 100644
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -174,6 +174,32 @@ const char *utf8_is_valid(const char *str) {
return str;
}
+char *utf8_escape_invalid(const char *str) {
+ char *p, *s;
+
+ assert(str);
+
+ p = s = malloc(strlen(str) * 4 + 1);
+ if (!p)
+ return NULL;
+
+ while (*str) {
+ int len;
+
+ len = utf8_encoded_valid_unichar(str);
+ if (len > 0) {
+ s = mempcpy(s, str, len);
+ str += len;
+ } else {
+ s = mempcpy(s, UTF8_REPLACEMENT_CHARACTER, strlen(UTF8_REPLACEMENT_CHARACTER));
+ str += 1;
+ }
+ }
+ *s = '\0';
+
+ return p;
+}
+
char *ascii_is_valid(const char *str) {
const char *p;
diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index f56077438a..c0eb73a21d 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -25,8 +25,11 @@
#include "macro.h"
+#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
+
const char *utf8_is_valid(const char *s) _pure_;
char *ascii_is_valid(const char *s) _pure_;
+char *utf8_escape_invalid(const char *s);
bool utf8_is_printable(const char* str, size_t length) _pure_;