chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that we don't dereference NULL
[elogind.git]
/
src
/
core
/
load-fragment.c
diff --git
a/src/core/load-fragment.c
b/src/core/load-fragment.c
index 70ea13aa8005c3a33469e2ce8a7b4b0640e0f7a7..f01843d65e77e28acbb984092ef6ec286f81f292 100644
(file)
--- a/
src/core/load-fragment.c
+++ b/
src/core/load-fragment.c
@@
-1788,7
+1788,6
@@
int config_parse_unit_requires_mounts_for(
char *state;
size_t l;
char *w;
char *state;
size_t l;
char *w;
- int r;
assert(filename);
assert(lvalue);
assert(filename);
assert(lvalue);
@@
-1796,6
+1795,7
@@
int config_parse_unit_requires_mounts_for(
assert(data);
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
assert(data);
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ int r;
_cleanup_free_ char *n;
n = strndup(w, l);
_cleanup_free_ char *n;
n = strndup(w, l);
@@
-1816,7
+1816,7
@@
int config_parse_unit_requires_mounts_for(
}
}
}
}
- return
r
;
+ return
0
;
}
int config_parse_documentation(const char *unit,
}
int config_parse_documentation(const char *unit,
@@
-1860,7
+1860,8
@@
int config_parse_documentation(const char *unit,
free(*a);
}
}
free(*a);
}
}
- *b = NULL;
+ if (b)
+ *b = NULL;
return r;
}
return r;
}