chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fbeefb4
)
core: fix double free
author
Lennart Poettering
<lennart@poettering.net>
Fri, 11 Jan 2013 22:39:23 +0000
(23:39 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 14 Jan 2013 20:24:57 +0000
(21:24 +0100)
src/core/load-dropin.c
patch
|
blob
|
history
diff --git
a/src/core/load-dropin.c
b/src/core/load-dropin.c
index d53e77f706e042e61e0f300269e1f05e2516a381..52ebfea6dc7d3ae79f6c0c6152adc981198d6fe4 100644
(file)
--- a/
src/core/load-dropin.c
+++ b/
src/core/load-dropin.c
@@
-168,7
+168,8
@@
int unit_load_dropin(Unit *u) {
}
if (!strv_isempty(strv)) {
}
if (!strv_isempty(strv)) {
- _cleanup_strv_free_ char **files = NULL, **f;
+ _cleanup_strv_free_ char **files = NULL;
+ char **f;
r = conf_files_list_strv(&files, ".conf", (const char**) strv);
if (r < 0) {
r = conf_files_list_strv(&files, ".conf", (const char**) strv);
if (r < 0) {
@@
-183,6
+184,5
@@
int unit_load_dropin(Unit *u) {
}
}
}
}
-
return 0;
}
return 0;
}