From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 2 May 2015 17:01:28 +0000 (-0500)
Subject: fstab-generator: fix memleak
X-Git-Tag: v220~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=336b5c615e9c101476784b32df1b86aaeac96431;p=thirdparty%2Fsystemd.git

fstab-generator: fix memleak

filtered was used to store an allocated string twice. The first allocation was
thus lost. The string is not needed for anything, so simply skip the allocation.

Fixup for deb0a77cf0b409141c4.
---

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index cb5112ec6d1..7aee3359e77 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -154,13 +154,13 @@ static bool mount_in_initrd(struct mntent *me) {
                streq(me->mnt_dir, "/usr");
 }
 
-static int write_idle_timeout(FILE *f, const char *where, const char *opts, char **filtered) {
+static int write_idle_timeout(FILE *f, const char *where, const char *opts) {
         _cleanup_free_ char *timeout = NULL;
         char timespan[FORMAT_TIMESPAN_MAX];
         usec_t u;
         int r;
 
-        r = fstab_filter_options(opts, "x-systemd.idle-timeout\0", NULL, &timeout, filtered);
+        r = fstab_filter_options(opts, "x-systemd.idle-timeout\0", NULL, &timeout, NULL);
         if (r < 0)
                 return log_warning_errno(r, "Failed to parse options: %m");
         if (r == 0)
@@ -315,7 +315,7 @@ static int add_mount(
                         "Where=%s\n",
                         where);
 
-                r = write_idle_timeout(f, where, opts, &filtered);
+                r = write_idle_timeout(f, where, opts);
                 if (r < 0)
                         return r;