chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ask-password: properly accept empty passwords from agent
[elogind.git]
/
src
/
strv.c
diff --git
a/src/strv.c
b/src/strv.c
index c8ff5745e82024bead8e6f997f1d1f0f4e0815b6..c5f8df06da6e8325b36dbbe0dec5b5dc54910fe4 100644
(file)
--- a/
src/strv.c
+++ b/
src/strv.c
@@
-78,9
+78,11
@@
char **strv_copy(char **l) {
return r;
fail:
- for (k--
, l--; k >= r; k--, l
--)
+ for (k--
; k >= r; k
--)
free(*k);
+ free(r);
+
return NULL;
}
@@
-435,6
+437,8
@@
char **strv_env_merge(unsigned n_lists, ...) {
return r;
fail:
+ va_end(ap);
+
for (k--; k >= r; k--)
free(*k);