chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: properly validate environment data from Environment= lines in unit files
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index 68ab80470e5348ae0d7c0cc160edb74f136324d0..c5dd26db5240d1dcf650e46275f29c1485df3f45 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-377,7
+377,8
@@
int config_parse_int(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- if ((r = safe_atoi(rvalue, i)) < 0) {
+ r = safe_atoi(rvalue, i);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value, ingoring: %s", filename, line, rvalue);
return 0;
}
log_error("[%s:%u] Failed to parse numeric value, ingoring: %s", filename, line, rvalue);
return 0;
}
@@
-403,7
+404,8
@@
int config_parse_long(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- if ((r = safe_atoli(rvalue, i)) < 0) {
+ r = safe_atoli(rvalue, i);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
@@
-429,7
+431,8
@@
int config_parse_uint64(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- if ((r = safe_atou64(rvalue, u)) < 0) {
+ r = safe_atou64(rvalue, u);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
@@
-455,7
+458,8
@@
int config_parse_unsigned(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- if ((r = safe_atou(rvalue, u)) < 0) {
+ r = safe_atou(rvalue, u);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return r;
}
log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return r;
}
@@
-593,9
+597,9
@@
int config_parse_string(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- n =
cunescape
(rvalue);
+ n =
strdup
(rvalue);
if (!n)
if (!n)
- return
-ENOMEM
;
+ return
log_oom()
;
if (!utf8_is_valid(n)) {
log_error("[%s:%u] String is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
if (!utf8_is_valid(n)) {
log_error("[%s:%u] String is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
@@
-644,7
+648,7
@@
int config_parse_path(
n = strdup(rvalue);
if (!n)
n = strdup(rvalue);
if (!n)
- return
-ENOMEM
;
+ return
log_oom()
;
path_kill_slashes(n);
path_kill_slashes(n);
@@
-664,12
+668,8
@@
int config_parse_strv(
void *data,
void *userdata) {
void *data,
void *userdata) {
- char*** sv = data;
- char **n;
- char *w;
- unsigned k;
+ char *** sv = data, *w, *state;
size_t l;
size_t l;
- char *state;
int r;
assert(filename);
int r;
assert(filename);
@@
-677,48
+677,31
@@
int config_parse_strv(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- k = strv_length(*sv);
- FOREACH_WORD_QUOTED(w, l, rvalue, state)
- k++;
-
- n = new(char*, k+1);
- if (!n)
- return -ENOMEM;
-
- if (*sv)
- for (k = 0; (*sv)[k]; k++)
- n[k] = (*sv)[k];
- else
- k = 0;
+ if (isempty(rvalue)) {
+ /* Empty assignment resets the list */
+ strv_free(*sv);
+ *sv = NULL;
+ return 0;
+ }
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-
n[k] = cunescape_length(w, l)
;
- if (!n[k]) {
-
r = -ENOMEM
;
- goto fail;
- }
+
_cleanup_free_ char *n
;
+
+
n = cunescape_length(w, l)
;
+ if (!n)
+ return log_oom();
- if (!utf8_is_valid(n[k])) {
- log_error("[%s:%u] String is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
- free(n[k]);
+ if (!utf8_is_valid(n)) {
+ log_error("[%s:%u] String is not UTF-8 clean, ignoring: %s", filename, line, rvalue);
continue;
}
continue;
}
- k++;
+ r = strv_extend(sv, n);
+ if (r < 0)
+ return log_oom();
}
}
- n[k] = NULL;
- free(*sv);
- *sv = n;
-
return 0;
return 0;
-
-fail:
- for (; k > 0; k--)
- free(n[k-1]);
- free(n);
-
- return r;
}
int config_parse_path_strv(
}
int config_parse_path_strv(
@@
-731,12
+714,8
@@
int config_parse_path_strv(
void *data,
void *userdata) {
void *data,
void *userdata) {
- char*** sv = data;
- char **n;
- char *w;
- unsigned k;
+ char*** sv = data, *w, *state;
size_t l;
size_t l;
- char *state;
int r;
assert(filename);
int r;
assert(filename);
@@
-744,54
+723,37
@@
int config_parse_path_strv(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- k = strv_length(*sv);
- FOREACH_WORD_QUOTED(w, l, rvalue, state)
- k++;
-
- n = new(char*, k+1);
- if (!n)
- return -ENOMEM;
-
- k = 0;
- if (*sv)
- for (; (*sv)[k]; k++)
- n[k] = (*sv)[k];
+ if (isempty(rvalue)) {
+ /* Empty assignment resets the list */
+ strv_free(*sv);
+ *sv = NULL;
+ return 0;
+ }
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
- n[k] = strndup(w, l);
- if (!n[k]) {
- r = -ENOMEM;
- goto fail;
- }
+ _cleanup_free_ char *n;
- if (!utf8_is_valid(n[k])) {
+ n = strndup(w, l);
+ if (!n)
+ return log_oom();
+
+ if (!utf8_is_valid(n)) {
log_error("[%s:%u] Path is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
log_error("[%s:%u] Path is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
- free(n[k]);
continue;
}
continue;
}
- if (!path_is_absolute(n
[k]
)) {
+ if (!path_is_absolute(n)) {
log_error("[%s:%u] Not an absolute path, ignoring: %s", filename, line, rvalue);
log_error("[%s:%u] Not an absolute path, ignoring: %s", filename, line, rvalue);
- free(n[k]);
continue;
}
continue;
}
- path_kill_slashes(n[k]);
- k++;
+ path_kill_slashes(n);
+ r = strv_extend(sv, n);
+ if (r < 0)
+ return log_oom();
}
}
- n[k] = NULL;
- free(*sv);
- *sv = n;
-
return 0;
return 0;
-
-fail:
- for (; k > 0; k--)
- free(n[k-1]);
- free(n);
-
- return r;
}
int config_parse_usec(
}
int config_parse_usec(
@@
-865,7
+827,7
@@
int config_parse_mode(
errno = 0;
l = strtol(rvalue, &x, 8);
errno = 0;
l = strtol(rvalue, &x, 8);
- if (!x || *x || errno) {
+ if (!x ||
x == rvalue ||
*x || errno) {
log_error("[%s:%u] Failed to parse mode value, ignoring: %s", filename, line, rvalue);
return 0;
}
log_error("[%s:%u] Failed to parse mode value, ignoring: %s", filename, line, rvalue);
return 0;
}
@@
-957,6
+919,16
@@
int config_parse_set_status(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
+ if (isempty(rvalue)) {
+ /* Empty assignment resets the list */
+
+ set_free(status_set->signal);
+ set_free(status_set->code);
+
+ status_set->signal = status_set->code = NULL;
+ return 0;
+ }
+
FOREACH_WORD(w, l, rvalue, state) {
int val;
char *temp;
FOREACH_WORD(w, l, rvalue, state) {
int val;
char *temp;