console: fix console.dir crash on a revoked proxy

Fixes: #43095 Signed-off-by: Daeyeon Jeong [email protected] PR-URL: #43100 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>
nodejs · Jul 31, 2022 · 35fc1c2 · 35fc1c2
1 parent c89512a
commit 35fc1c2
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -759,6 +759,9 @@ function formatValue(ctx, value, recurseTimes, typedArray) {
   // any proxy handlers.
   const proxy = getProxyDetails(value, !!ctx.showProxy);
   if (proxy !== undefined) {
+    if (proxy === null || proxy[0] === null) {
+      return ctx.stylize('<Revoked Proxy>', 'special');
+    }
     if (ctx.showProxy) {
       return formatProxy(ctx, proxy, recurseTimes);
     }
@@ -1967,6 +1970,9 @@ function hasBuiltInToString(value) {
   const getFullProxy = false;
   const proxyTarget = getProxyDetails(value, getFullProxy);
   if (proxyTarget !== undefined) {
+    if (proxyTarget === null) {
+      return true;
+    }
     value = proxyTarget;
   }
 

diff --git a/test/parallel/test-console-issue-43095.js b/test/parallel/test-console-issue-43095.js
@@ -0,0 +1,12 @@
+'use strict';
+
+require('../common');
+const { inspect } = require('node:util');
+
+const r = Proxy.revocable({}, {});
+r.revoke();
+
+console.dir(r);
+console.dir(r.proxy);
+console.log(r.proxy);
+console.log(inspect(r.proxy, { showProxy: true }));
diff --git a/test/parallel/test-util-inspect-proxy.js b/test/parallel/test-util-inspect-proxy.js
@@ -57,6 +57,27 @@ assert.strictEqual(handler, details[1]);
 details = processUtil.getProxyDetails(proxyObj, false);
 assert.strictEqual(target, details);
 
+details = processUtil.getProxyDetails({}, true);
+assert.strictEqual(details, undefined);
+
+const r = Proxy.revocable({}, {});
+r.revoke();
+
+details = processUtil.getProxyDetails(r.proxy, true);
+assert.strictEqual(details[0], null);
+assert.strictEqual(details[1], null);
+
+details = processUtil.getProxyDetails(r.proxy, false);
+assert.strictEqual(details, null);
+
+assert.strictEqual(util.inspect(r.proxy), '<Revoked Proxy>');
+assert.strictEqual(
+  util.inspect(r, { showProxy: true }),
+  '{ proxy: <Revoked Proxy>, revoke: [Function (anonymous)] }',
+);
+
+assert.strictEqual(util.format('%s', r.proxy), '<Revoked Proxy>');
+
 assert.strictEqual(
   util.inspect(proxyObj, opts),
   'Proxy [\n' +