picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 deb0a77cf0.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-05-02 12:01:28 -05:00
parent 35c0808fe0
commit 336b5c615e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fstab-generator/fstab-generator.c
View File

@ -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;