[systemd-devel] [systemd-commits] src/bus-proxyd src/login src/machine src/nspawn src/tmpfiles

Lennart Poettering lennart at poettering.net
Tue Feb 3 13:13:01 PST 2015


On Tue, 03.02.15 09:04, Thomas H.P. Andersen (phomes at gmail.com) wrote:

> On Tue, Feb 3, 2015 at 12:50 AM, Zbigniew Jędrzejewski-Szmek
> <zbyszek at in.waw.pl> wrote:
> > On Mon, Feb 02, 2015 at 02:07:37PM -0800, Thomas H.P. Andersen wrote:
> >> --- a/src/nspawn/nspawn.c
> >> +++ b/src/nspawn/nspawn.c
> >> @@ -3610,7 +3610,6 @@ int main(int argc, char *argv[]) {
> >>                  }
> >>
> >>                  if (arg_ephemeral) {
> >> -                        _cleanup_release_lock_file_ LockFile original_lock = LOCK_FILE_INIT;
> >>                          char *np;
> >>
> >>                          /* If the specified path is a mount point we
> >> diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
> >> index 930b9a6..443851a 100644
> >> --- a/src/tmpfiles/tmpfiles.c
> >> +++ b/src/tmpfiles/tmpfiles.c
> >> @@ -630,7 +630,7 @@ static int get_xattrs_from_arg(Item *i) {
> >>
> >>          while ((r = unquote_first_word(&p, &xattr, false)) > 0) {
> >>                  _cleanup_free_ char *tmp = NULL, *name = NULL,
> >> -                        *value = NULL, *value2 = NULL, *_xattr = xattr;
> >> +                        *value = NULL, *value2 = NULL;
> > This leaks xattr, no?
>
> oh, you are right. I will revert that.

For the sake of the archives: Thomas apparently fixed this now in git.

Lennart

-- 
Lennart Poettering, Red Hat


More information about the systemd-devel mailing list