2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 46ab1fcede..5e9ae54bc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 18 09:32:58 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (ruby_is_fd_loadable): this should be fail if st_mode is
+	  not regular file nor FIFO.
+
 Sun Oct 18 09:20:17 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* ruby.c (open_load_file): use rb_thread_wait_fd() instead of reopen.
diff --git a/file.c b/file.c
index b2ad989df6..784b003274 100644
--- a/file.c
+++ b/file.c
@@ -5680,13 +5680,17 @@ ruby_is_fd_loadable(int fd)
 
     if (fstat(fd, &st) < 0)
 	return 0;
-
     if (S_ISREG(st.st_mode))
 	return 1;
-    if (!S_ISDIR(st.st_mode))
+
+    if (S_ISFIFO(st.st_mode))
 	return 1;
 
-    errno = EISDIR;
+    if (S_ISDIR(st.st_mode))
+	errno = EISDIR;
+    else
+	errno = ENXIO;
+
     return 0;
 #endif
 }