From 34b877e49166c209e300ee9887f79b26b82821fc Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 16 Oct 2015 23:24:37 +0000 Subject: [PATCH] ruby.c: fd leak * ruby.c (load_file_internal): fix potential fd leak. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruby.c b/ruby.c index 6899ac2403..8267002866 100644 --- a/ruby.c +++ b/ruby.c @@ -1760,11 +1760,11 @@ load_file_internal(VALUE arg) #if !defined DOSISH && !defined __CYGWIN__ { struct stat st; - if (fstat(fd, &st) != 0) - rb_load_fail(fname_v, strerror(errno)); - if (S_ISDIR(st.st_mode)) { - errno = EISDIR; - rb_load_fail(fname_v, strerror(EISDIR)); + int e; + if ((fstat(fd, &st) != 0) && (e = errno, 1) || + (S_ISDIR(st.st_mode) && (e = EISDIR, 1))) { + (void)close(fd); + rb_load_fail(fname_v, strerror(e)); } } #endif