util: do not catch on circular @@toStringTag errors

avivkeller · cjihrig · aduh95 · commit 4129bc72e20c · 2024-11-06T11:48:35.000+01:00
PR-URL: #55544 Fixes: #55539 Reviewed-By: James M Snell <jasnell@gmail.com> Co-Authored-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -1072,6 +1072,7 @@ function formatRaw(ctx, value, recurseTimes, typedArray) {
 ArrayPrototypePushApply(output, protoProps);
 }
 } catch (err) {
+ if (!isStackOverflowError(err)) throw err;
 const constructorName = StringPrototypeSlice(getCtxStyle(value, constructor, tag), 0, -1);
 return handleMaxCallStackSize(ctx, err, constructorName, indentationLvl);
 }
@@ -1557,17 +1558,13 @@ function groupArrayElements(ctx, output, value) {
 }
 
 function handleMaxCallStackSize(ctx, err, constructorName, indentationLvl) {
- if (isStackOverflowError(err)) {
- ctx.seen.pop();
- ctx.indentationLvl = indentationLvl;
- return ctx.stylize(
- `[${constructorName}: Inspection interrupted ` +
- 'prematurely. Maximum call stack size exceeded.]',
- 'special',
- );
- }
- /* c8 ignore next */
- assert.fail(err.stack);
+ ctx.seen.pop();
+ ctx.indentationLvl = indentationLvl;
+ return ctx.stylize(
+ `[${constructorName}: Inspection interrupted ` +
+ 'prematurely. Maximum call stack size exceeded.]',
+ 'special',
+ );
 }
 
 function addNumericSeparator(integerString) {
diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
@@ -1644,6 +1644,15 @@ util.inspect(process);
 
 assert.throws(() => util.inspect(new ThrowingClass()), /toStringTag error/);
 
+ const y = {
+ get [Symbol.toStringTag]() {
+ return JSON.stringify(this);
+ }
+ };
+ const x = { y };
+ y.x = x;
+ assert.throws(() => util.inspect(x), /TypeError: Converting circular structure to JSON/);
+
 class NotStringClass {
 get [Symbol.toStringTag]() {
 return null;

-Original file line number
+Diff line change
 ArrayPrototypePushApply(output,protoProps);
+}
 }catch(err){
 +if(!isStackOverflowError(err))throwerr;
 constconstructorName=StringPrototypeSlice(getCtxStyle(value,constructor,tag),0,-1);
 returnhandleMaxCallStackSize(ctx,err,constructorName,indentationLvl);
+}
+}
 functionhandleMaxCallStackSize(ctx,err,constructorName,indentationLvl){
 -if(isStackOverflowError(err)){
 -ctx.seen.pop();
 -ctx.indentationLvl=indentationLvl;
 -returnctx.stylize(
 -`[${constructorName}: Inspection interrupted `+
 -'prematurely. Maximum call stack size exceeded.]',
 -'special',
 -);
 -}
 -/* c8 ignore next */
 -assert.fail(err.stack);
 +ctx.seen.pop();
 +ctx.indentationLvl=indentationLvl;
 +returnctx.stylize(
 +`[${constructorName}: Inspection interrupted `+
 +'prematurely. Maximum call stack size exceeded.]',
 +'special',
 +);
+}
 functionaddNumericSeparator(integerString){
-Original file line number
+Diff line change
 assert.throws(()=>util.inspect(newThrowingClass()),/toStringTagerror/);
 +consty={
 +get[Symbol.toStringTag](){
 +returnJSON.stringify(this);
 +}
 +};
 +constx={ y };
 +y.x=x;
 +assert.throws(()=>util.inspect(x),/TypeError:ConvertingcircularstructuretoJSON/);
++
 classNotStringClass{
 get[Symbol.toStringTag](){
 returnnull;