Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Fri, 31 Jan 2020 13:26:51
Message-Id: 1580476139.029cf600be9203e944180bcd0fd4da714052457c.grobian@gentoo
1 commit: 029cf600be9203e944180bcd0fd4da714052457c
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 31 13:08:59 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 31 13:08:59 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=029cf600
7
8 qmerge: fix Coverity 207952 Resource leak
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qmerge.c | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/qmerge.c b/qmerge.c
16 index fc20f10..5eec188 100644
17 --- a/qmerge.c
18 +++ b/qmerge.c
19 @@ -1604,14 +1604,15 @@ unlink_empty(const char *buf)
20 {
21 struct stat st;
22 int fd;
23 + int ret = -1;
24
25 fd = open(buf, O_RDONLY);
26 if (fd != -1 && stat(buf, &st) != -1) {
27 if (st.st_size == 0)
28 - return unlink(buf);
29 + ret = unlink(buf);
30 close(fd);
31 }
32 - return -1;
33 + return ret;
34 }
35
36 static int