fs: add missing call to uv_fs_req_cleanup

Justin-Nietzel · RafaelGSS · commit 9f403e98ef45 · 2025-05-12T12:04:14.000-03:00
Always call uv_fs_req_cleanup after calling uv_fs_open instead of just when uv_fs_open returns a negative result. I referenced ReadFileSync from node:js2c when making this change. https://github.com/bnoordhuis made the same suggestion based on the PR #49691. Fixes: #57800 PR-URL: #57811 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> CVE-ID: CVE-2025-23165
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -2594,10 +2594,10 @@ static void ReadFileUtf8(const FunctionCallbackInfo<Value>& args) {
     FS_SYNC_TRACE_END(open);
     if (req.result < 0) {
       uv_fs_req_cleanup(&req);
-      // req will be cleaned up by scope leave.
       return env->ThrowUVException(
           static_cast<int>(req.result), "open", nullptr, path.out());
     }
+    uv_fs_req_cleanup(&req);
   }
 
   auto defer_close = OnScopeLeave([file, is_fd, &req]() {

Original file line number	Diff line number	Diff line change
`@@ -2594,10 +2594,10 @@ static void ReadFileUtf8(const FunctionCallbackInfo<Value>& args) {`
`2594`	`2594`	`FS_SYNC_TRACE_END(open);`
`2595`	`2595`	`if (req.result < 0) {`
`2596`	`2596`	`uv_fs_req_cleanup(&req);`
`2597`		`- // req will be cleaned up by scope leave.`
`2598`	`2597`	`return env->ThrowUVException(`
`2599`	`2598`	`static_cast<int>(req.result), "open", nullptr, path.out());`
`2600`	`2599`	`}`
	`2600`	`+ uv_fs_req_cleanup(&req);`
`2601`	`2601`	`}`
`2602`	`2602`
`2603`	`2603`	`auto defer_close = OnScopeLeave([file, is_fd, &req]() {`