summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-04-09 22:13:17 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-04-10 00:04:57 -0400
commit2c76be7c1b26e22cfda63e39786f277ae53e459e (patch)
tree309d723076ba17eeb2dfa83f567c335da51a8b20
parent31dd6b86c156c3b7ab54c8026424b60b31eca435 (diff)
xserver: Don't leak lockfile fd on error path
-rw-r--r--src/xserver-launcher.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c
index 502b9d4..d3657c8 100644
--- a/src/xserver-launcher.c
+++ b/src/xserver-launcher.c
@@ -1645,6 +1645,7 @@ create_lockfile(int display, char *lockfile, size_t lsize)
if (end != pid + 10) {
fprintf(stderr, "can't parse lock file %s\n",
lockfile);
+ close(fd);
errno = EEXIST;
return -1;
}
@@ -1655,6 +1656,7 @@ create_lockfile(int display, char *lockfile, size_t lsize)
"unlinking stale lock file %s\n", lockfile);
unlink(lockfile);
errno = EAGAIN;
+ close(fd);
return -1;
}