Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:0.26.x commit in: src/rc/
Date: Tue, 30 May 2017 17:49:41
Message-Id: 1496165555.809c205c356992145b8781ae07a5d3c98b79a8c9.williamh@OpenRC
1 commit: 809c205c356992145b8781ae07a5d3c98b79a8c9
2 Author: Sergei Trofimovich <slyfox <AT> inbox <DOT> ru>
3 AuthorDate: Tue May 30 07:47:55 2017 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue May 30 17:32:35 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=809c205c
7
8 rc-logger.c: fix crash on fclose(NULL) (#137)
9
10 Only close the log if we successfully opened it.
11
12 Reported-by: Brian Evans <grknight <AT> gentoo.org>
13 Tested-by: Brian Evans <grknight <AT> gentoo.org>
14 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
15
16 src/rc/rc-logger.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c
20 index b4bd0eae..062ce3d9 100644
21 --- a/src/rc/rc-logger.c
22 +++ b/src/rc/rc-logger.c
23 @@ -261,12 +261,12 @@ rc_logger_open(const char *level)
24 break;
25 }
26 }
27 + fclose(log);
28 } else {
29 log_error = 1;
30 eerror("Error: fopen(%s) failed: %s", TMPLOG, strerror(errno));
31 }
32
33 - fclose(log);
34 fclose(plog);
35 } else {
36 /*