summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorGoffredo Baroncelli <kreijack@libero.it>2014-02-06 19:09:59 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-08 13:07:39 -0500
commitf27f0e2177ac0a4b96585aed7db3a080e27a2f00 (patch)
tree037b2dbedc0da6b3c45a5ce27f3dfbb19b372fab /src/shared
parentecd2f2c5947d9e2f4d6792c2a3a90b8ced6a5b3e (diff)
core: fix crashes if locale.conf contains invalid utf-8 string
In the parse_env_file_push() and load_env_file_push() functions, there are two assert() call to check if the key or value parameters are utf8 valid. If the strings aren't utf8 valid, assert does abort. These function are used early by systemd to parse some files. For example '/etc/locale.conf'. In my case this file contained a not utf8 sequence, which is bad, but systemd crashed during the boot, which is even worse! The enclosed patch removes the assert and return -EINVAL if the sequence is invalid. This is possible because the caller of these function [1] checks the errors. So the check of an invalid utf8 sequence is still performed, but systemd doesn't crash anymore and logs the error. [1] parse_env_file_internal(), invoked by load_env_file() and parse_env_file()
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/fileio.c77
1 files changed, 43 insertions, 34 deletions
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
index ede88196b5..838d128433 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -534,35 +534,39 @@ fail:
static int parse_env_file_push(const char *filename, unsigned line,
const char *key, char *value, void *userdata) {
- assert(utf8_is_valid(key));
- if (value && !utf8_is_valid(value))
+ const char *k;
+ va_list aq, *ap = userdata;
+
+ if (!utf8_is_valid(key)) {
+ log_error("%s:%u: invalid UTF-8 for key '%s', ignoring.",
+ filename, line, key);
+ return -EINVAL;
+ }
+
+ if (value && !utf8_is_valid(value)) {
/* FIXME: filter UTF-8 */
- log_error("%s:%u: invalid UTF-8 for key %s: '%s', ignoring.",
+ log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.",
filename, line, key, value);
- else {
- const char *k;
- va_list* ap = (va_list*) userdata;
- va_list aq;
+ return -EINVAL;
+ }
- va_copy(aq, *ap);
+ va_copy(aq, *ap);
- while ((k = va_arg(aq, const char *))) {
- char **v;
+ while ((k = va_arg(aq, const char *))) {
+ char **v;
- v = va_arg(aq, char **);
+ v = va_arg(aq, char **);
- if (streq(key, k)) {
- va_end(aq);
- free(*v);
- *v = value;
- return 1;
- }
+ if (streq(key, k)) {
+ va_end(aq);
+ free(*v);
+ *v = value;
+ return 1;
}
-
- va_end(aq);
}
+ va_end(aq);
free(value);
return 0;
}
@@ -586,26 +590,31 @@ int parse_env_file(
static int load_env_file_push(const char *filename, unsigned line,
const char *key, char *value, void *userdata) {
- assert(utf8_is_valid(key));
+ char ***m = userdata;
+ char *p;
+ int r;
- if (value && !utf8_is_valid(value))
+ if (!utf8_is_valid(key)) {
+ log_error("%s:%u: invalid UTF-8 for key '%s', ignoring.",
+ filename, line, key);
+ return -EINVAL;
+ }
+
+ if (value && !utf8_is_valid(value)) {
/* FIXME: filter UTF-8 */
- log_error("%s:%u: invalid UTF-8 for key %s: '%s', ignoring.",
+ log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.",
filename, line, key, value);
- else {
- char ***m = userdata;
- char *p;
- int r;
+ return -EINVAL;
+ }
- p = strjoin(key, "=", strempty(value), NULL);
- if (!p)
- return -ENOMEM;
+ p = strjoin(key, "=", strempty(value), NULL);
+ if (!p)
+ return -ENOMEM;
- r = strv_push(m, p);
- if (r < 0) {
- free(p);
- return r;
- }
+ r = strv_push(m, p);
+ if (r < 0) {
+ free(p);
+ return r;
}
free(value);