From fe230fccd4ba1cea6c1962a5a533804e05b2ab04 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sat, 26 Feb 2011 15:21:45 +0000 Subject: [PATCH] re PR libfortran/45165 (unix.c:fallback_access() leaks file descriptors) PR libfortran/45165 * unix.c (fallback_access): Fix file descriptor leaks. From-SVN: r170517 --- libgfortran/ChangeLog | 5 +++++ libgfortran/io/unix.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index dbafd0c9589..bc85a6c9e0f 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2011-02-26 Francois-Xavier Coudert + + PR libfortran/45165 + * unix.c (fallback_access): Fix file descriptor leaks. + 2011-02-25 Francois-Xavier Coudert * acinclude.m4 (LIBGFOR_CHECK_FPSETMASK): Set shell variable diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index 004e8606c0a..12536ca5cbe 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -144,11 +144,15 @@ typedef struct stat gfstat_t; static int fallback_access (const char *path, int mode) { - if ((mode & R_OK) && open (path, O_RDONLY) < 0) + int fd; + + if ((mode & R_OK) && (fd = open (path, O_RDONLY)) < 0) return -1; + close (fd); - if ((mode & W_OK) && open (path, O_WRONLY) < 0) + if ((mode & W_OK) && (fd = open (path, O_WRONLY)) < 0) return -1; + close (fd); if (mode == F_OK) { -- 2.30.2