Merge branch 'nodejs:main' into main

Author: HumaneLogic

lib/internal/fs/dir.js

@@ -59,7 +59,13 @@ class Dir {
       }),
     };
 
-    validateUint32(this.#options.bufferSize, 'options.bufferSize', true);
+    try {
+      validateUint32(this.#options.bufferSize, 'options.bufferSize', true);
+    } catch (validationError) {
+      // Userland won't be able to close handle if we throw, so we close it first
+      this.#handle.close();
+      throw validationError;
+    }
 
     this.#readPromisified = FunctionPrototypeBind(
       promisify(this.#readImpl), this, false);

src/node_os.cc

@@ -214,6 +214,9 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) {
     return;
   }
 
+  auto cleanup =
+      OnScopeLeave([&]() { uv_free_interface_addresses(interfaces, count); });
+
   Local<Value> no_scope_id = Integer::New(isolate, -1);
   LocalVector<Value> result(isolate);
   result.reserve(count * 7);
@@ -268,7 +271,6 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) {
     }
   }
 
-  uv_free_interface_addresses(interfaces, count);
   args.GetReturnValue().Set(Array::New(isolate, result.data(), result.size()));
 }
 

test/parallel/test-fs-opendir.js

@@ -4,12 +4,20 @@ const common = require('../common');
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
+const process = require('node:process');
 
 const tmpdir = require('../common/tmpdir');
 
 const testDir = tmpdir.path;
 const files = ['empty', 'files', 'for', 'just', 'testing'];
 
+process.on('warning', (cause) => {
+  // If any directory handle was left unclosed and then GC'd,
+  // it will emit `Warning: Closing directory handle on garbage collection`.
+  // Treat this warning as error.
+  throw new Error('Expected no warnings', { cause });
+});
+
 // Make sure tmp directory is clean
 tmpdir.refresh();