chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reject invalid quoted strings
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index 2741989c4864ac10cc5b3c8dbb3e18eb10db58b6..fad15c7c3f3d88443e16677724fdd4f3024b7161 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-455,9
+455,8
@@
static int config_parse_cpu_affinity2(
void *data,
void *userdata) {
void *data,
void *userdata) {
- c
har *w
;
+ c
onst char *word, *state
;
size_t l;
size_t l;
- char *state;
cpu_set_t *c = NULL;
unsigned ncpus = 0;
cpu_set_t *c = NULL;
unsigned ncpus = 0;
@@
-465,12
+464,12
@@
static int config_parse_cpu_affinity2(
assert(lvalue);
assert(rvalue);
assert(lvalue);
assert(rvalue);
- FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ FOREACH_WORD_QUOTED(w
ord
, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
char *t;
int r;
unsigned cpu;
- if (!(t = strndup(w, l)))
+ if (!(t = strndup(w
ord
, l)))
return log_oom();
r = safe_atou(t, &cpu);
return log_oom();
r = safe_atou(t, &cpu);
@@
-559,7
+558,7
@@
static int config_parse_join_controllers(const char *unit,
void *userdata) {
unsigned n = 0;
void *userdata) {
unsigned n = 0;
- c
har *state, *w
;
+ c
onst char *word, *state
;
size_t length;
assert(filename);
size_t length;
assert(filename);
@@
-568,10
+567,10
@@
static int config_parse_join_controllers(const char *unit,
free_join_controllers();
free_join_controllers();
- FOREACH_WORD_QUOTED(w, length, rvalue, state) {
+ FOREACH_WORD_QUOTED(w
ord
, length, rvalue, state) {
char *s, **l;
char *s, **l;
- s = strndup(w, length);
+ s = strndup(w
ord
, length);
if (!s)
return log_oom();
if (!s)
return log_oom();