src: use S_ISDIR to check if the file is a directory

theanarkh · targos · commit fca38b2d6ec4 · 2024-05-12T21:22:00.000+02:00
PR-URL: #52164 Fixes: #52159 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -1054,7 +1054,7 @@ static void InternalModuleStat(const FunctionCallbackInfo<Value>& args) {
   int rc = uv_fs_stat(env->event_loop(), &req, *path, nullptr);
   if (rc == 0) {
     const uv_stat_t* const s = static_cast<const uv_stat_t*>(req.ptr);
-    rc = !!(s->st_mode & S_IFDIR);
+    rc = S_ISDIR(s->st_mode);
   }
   uv_fs_req_cleanup(&req);
 
@@ -2982,7 +2982,7 @@ BindingData::FilePathIsFileReturnType BindingData::FilePathIsFile(
 
   if (rc == 0) {
     const uv_stat_t* const s = static_cast<const uv_stat_t*>(req.ptr);
-    rc = !!(s->st_mode & S_IFDIR);
+    rc = S_ISDIR(s->st_mode);
   }
 
   uv_fs_req_cleanup(&req);
diff --git a/src/permission/fs_permission.cc b/src/permission/fs_permission.cc
@@ -21,7 +21,7 @@ std::string WildcardIfDir(const std::string& res) noexcept {
   int rc = uv_fs_stat(nullptr, &req, res.c_str(), nullptr);
   if (rc == 0) {
     const uv_stat_t* const s = static_cast<const uv_stat_t*>(req.ptr);
-    if (s->st_mode & S_IFDIR) {
+    if ((s->st_mode & S_IFMT) == S_IFDIR) {
       // add wildcard when directory
       if (res.back() == node::kPathSeparator) {
         return res + "*";
diff --git a/test/parallel/test-fs-readdir-recursive.js b/test/parallel/test-fs-readdir-recursive.js
@@ -0,0 +1,14 @@
+'use strict';
+const common = require('../common');
+const fs = require('fs');
+const net = require('net');
+
+const tmpdir = require('../common/tmpdir');
+tmpdir.refresh();
+
+const server = net.createServer().listen(common.PIPE, common.mustCall(() => {
+  // The process should not crash
+  // See https://github.com/nodejs/node/issues/52159
+  fs.readdirSync(tmpdir.path, { recursive: true });
+  server.close();
+}));

Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ static void InternalModuleStat(const FunctionCallbackInfo<Value>& args) {`
`1054`	`1054`	`int rc = uv_fs_stat(env->event_loop(), &req, *path, nullptr);`
`1055`	`1055`	`if (rc == 0) {`
`1056`	`1056`	`const uv_stat_t* const s = static_cast<const uv_stat_t*>(req.ptr);`
`1057`		`- rc = !!(s->st_mode & S_IFDIR);`
	`1057`	`+ rc = S_ISDIR(s->st_mode);`
`1058`	`1058`	`}`
`1059`	`1059`	`uv_fs_req_cleanup(&req);`
`1060`	`1060`
`@@ -2982,7 +2982,7 @@ BindingData::FilePathIsFileReturnType BindingData::FilePathIsFile(`
`2982`	`2982`
`2983`	`2983`	`if (rc == 0) {`
`2984`	`2984`	`const uv_stat_t* const s = static_cast<const uv_stat_t*>(req.ptr);`
`2985`		`- rc = !!(s->st_mode & S_IFDIR);`
	`2985`	`+ rc = S_ISDIR(s->st_mode);`
`2986`	`2986`	`}`
`2987`	`2987`
`2988`	`2988`	`uv_fs_req_cleanup(&req);`