NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06: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>
This commit is contained in:
Martin Kletzander 2014-09-07 20:07:49 +02:00
parent 8035f2e6f2
commit aaaa2d56bd
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/virpidfile.c
View File

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