Merge branch 'master' into v2.1

1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib_io.c b/src/lib_io.c
index 7c06b78e..b9d8cc75 100644
--- a/src/lib_io.c
+++ b/src/lib_io.c
@@ -284,8 +284,14 @@ static int io_file_lines(lua_State *L)
 
 LJLIB_CF(io_method_close)
 {
-  IOFileUD *iof = L->base < L->top ? io_tofile(L) :
-                  io_stdfile(L, GCROOT_IO_OUTPUT);
+  IOFileUD *iof;
+  if (L->base < L->top) {
+    iof = io_tofile(L);
+  } else {
+    iof = IOSTDF_IOF(L, GCROOT_IO_OUTPUT);
+    if (iof->fp == NULL)
+      lj_err_caller(L, LJ_ERR_IOCLFL);
+  }
   return io_file_close(L, iof);
 }