External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 19:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: fix potential leak in error codepath

Browse Source 
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
(cherry picked from commit aaaa2d56bd47556b6857ecca33e4b28ab36c8488)

Conflicts:
	src/util/virpidfile.c - undo temporary bisection fix in previous patch
This commit is contained in:
Martin Kletzander 2014-09-07 20:07:49 +02:00 committed by Eric Blake
parent 5ddbe2511a
commit a34ec87d2d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/util/virpidfile.c
View File

@ -529,6 +529,9 @@ virPidFileConstructPath(bool privileged,
const char *progname,
char **pidfile)
{
int ret = -1;
char *rundir = NULL;
if (privileged) {
/*
* This is here just to allow calling this function with
@ -537,34 +540,32 @@ virPidFileConstructPath(bool privileged,
if (!statedir) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("No statedir specified"));
goto error;
goto cleanup;
}
if (virAsprintf(pidfile, "%s/run/%s.pid", statedir, progname) < 0)
goto error;
goto cleanup;
} else {
char *rundir = NULL;
mode_t old_umask;
if (!(rundir = virGetUserRuntimeDirectory()))
goto error;
goto cleanup;
old_umask = umask(077);
if (virFileMakePath(rundir) < 0) {
umask(old_umask);
goto error;
goto cleanup;
}
umask(old_umask);
if (virAsprintf(pidfile, "%s/%s.pid", rundir, progname) < 0) {
VIR_FREE(rundir);
goto error;
goto cleanup;
}
VIR_FREE(rundir);
}
return 0;
error:
return -1;
ret = 0;
cleanup:
VIR_FREE(rundir);
return ret;
}