fix: avoid dir be gc early.

close #644
luvit · Aug 19, 2023 · 3d7ef4d · 3d7ef4d
1 parent ff5e902
commit 3d7ef4d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/fs.c b/src/fs.c
@@ -363,6 +363,9 @@ static int push_fs_result(lua_State* L, uv_fs_t* req) {
       return 1;
     }
     case UV_FS_READDIR: {
+      luaL_unref(L, LUA_REGISTRYINDEX, data->data_ref);
+      data->data_ref = LUA_NOREF;
+
       if(req->result > 0) {
         size_t i;
         uv_dir_t *dir = (uv_dir_t*)req->ptr;
@@ -938,6 +941,11 @@ static int luv_fs_readdir(lua_State* L) {
 
   req = (uv_fs_t*)lua_newuserdata(L, uv_req_size(UV_FS));
   req->data = luv_setup_req(L, ctx, ref);
+
+  //make data_ref to dir
+  lua_pushvalue(L, 1);
+  ((luv_req_t*)req->data)->data_ref = luaL_ref(L, LUA_REGISTRYINDEX);
+
   FS_CALL(uv_fs_readdir, req, dir->handle);
 }
 

diff --git a/tests/test-fs.lua b/tests/test-fs.lua
@@ -269,6 +269,24 @@ return require('lib/tap')(function (test)
     end
   end, "1.28.0")
 
+  test("fs.{open,read,close}dir ref check", function(print, p, expect, uv)
+    local dir = assert(uv.fs_opendir('.', nil, 50))
+
+    local function readdir_cb(err, dirs)
+      assert(not err)
+      if dirs then
+        p(dirs)
+      end
+    end
+
+    uv.fs_readdir(dir, readdir_cb)
+    dir = nil
+    collectgarbage()
+    collectgarbage()
+    collectgarbage()
+
+  end, "1.28.0")
+
   test("fs.statfs sync", function (print, p, expect, uv)
     local stat = assert(uv.fs_statfs("."))
     p(stat)