close state file + unlink before closing to avoid race condition

Signed-off-by: Mattias Andrée <maandree@member.fsf.org>

2 files changed, 3 insertions, 2 deletions

diff --git a/src/satd-diminished.c b/src/satd-diminished.c
index 632e29b..48ada56 100644
--- a/src/satd-diminished.c
+++ b/src/satd-diminished.c
@@ -76,9 +76,10 @@ main(int argc, char *argv[])
 	shutdown(fd, SHUT_RDWR);
 	close(fd);
 
-	close(SOCK_FILENO);
 	unlink(argv[1]);
 	unlink(argv[2]); /* Only on success! */
+	close(SOCK_FILENO);
+	close(STATE_FILENO);
 	return 0;
 	(void) argc;
 }
diff --git a/src/satd.c b/src/satd.c
index fae8e0b..f69af3b 100644
--- a/src/satd.c
+++ b/src/satd.c
@@ -273,8 +273,8 @@ fail:
 		perror(argv0);
 	free(path);
 	if (sock >= 0) {
-		close(sock);
 		unlink(address.sun_path);
+		close(sock);
 	}
 	if (state >= 0)
 		close(state);