GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — util: use more defensive code when inspecting error objects · nodejs/node@4a86016

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal
- util.js
- util
  - inspect.js
test/parallel
- test-util-inspect.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/internal/util.js‎`

Copy file name to clipboardExpand all lines: lib/internal/util.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ const {`
`8`	`8`	`Error,`
`9`	`9`	`ErrorCaptureStackTrace,`
`10`	`10`	`FunctionPrototypeCall,`
	`11`	`+ FunctionPrototypeSymbolHasInstance,`
`11`	`12`	`NumberParseInt,`
`12`	`13`	`ObjectDefineProperties,`
`13`	`14`	`ObjectDefineProperty,`
`@@ -96,7 +97,7 @@ function isError(e) {`
`96`	`97`	`// An error could be an instance of Error while not being a native error`
`97`	`98`	`// or could be from a different realm and not be instance of Error but still`
`98`	`99`	`// be a native error.`
`99`		`- return isNativeError(e) \|\| e instanceof Error;`
	`100`	`+ return isNativeError(e) \|\| FunctionPrototypeSymbolHasInstance(Error, e);`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`// Keep a list of deprecation codes that have been warned on so we only warn on`

Collapse file

`‎lib/internal/util/inspect.js‎`

Copy file name to clipboardExpand all lines: lib/internal/util/inspect.js

+62-23Lines changed: 62 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ const {`
`72`	`72`	`ObjectPrototype,`
`73`	`73`	`ObjectPrototypeHasOwnProperty,`
`74`	`74`	`ObjectPrototypePropertyIsEnumerable,`
	`75`	`+ ObjectPrototypeToString,`
`75`	`76`	`ObjectSeal,`
`76`	`77`	`ObjectSetPrototypeOf,`
`77`	`78`	`Promise,`
`@@ -1720,13 +1721,19 @@ function getDuplicateErrorFrameRanges(frames) {`
`1720`	`1721`	`}`
`1721`	`1722`
`1722`	`1723`	`function getStackString(ctx, error) {`
`1723`		`- if (error.stack) {`
`1724`		`- if (typeof error.stack === 'string') {`
`1725`		`- return error.stack;`
	`1724`	`+ let stack;`
	`1725`	`+ try {`
	`1726`	`+ stack = error.stack;`
	`1727`	`+ } catch {`
	`1728`	`+ // If stack is getter that throws, we ignore the error.`
	`1729`	`+ }`
	`1730`	`+ if (stack) {`
	`1731`	`+ if (typeof stack === 'string') {`
	`1732`	`+ return stack;`
`1726`	`1733`	`}`
`1727`	`1734`	`ctx.seen.push(error);`
`1728`	`1735`	`ctx.indentationLvl += 4;`
`1729`		`- const result = formatValue(ctx, error.stack);`
	`1736`	`+ const result = formatValue(ctx, stack);`
`1730`	`1737`	`ctx.indentationLvl -= 4;`
`1731`	`1738`	`ctx.seen.pop();`
`1732`	`1739`	return `${ErrorPrototypeToString(error)}\n ${result}`;
`@@ -1822,18 +1829,6 @@ function improveStack(stack, constructor, name, tag) {`
`1822`	`1829`	`return stack;`
`1823`	`1830`	`}`
`1824`	`1831`
`1825`		`-function removeDuplicateErrorKeys(ctx, keys, err, stack) {`
`1826`		`- if (!ctx.showHidden && keys.length !== 0) {`
`1827`		`- for (const name of ['name', 'message', 'stack']) {`
`1828`		`- const index = ArrayPrototypeIndexOf(keys, name);`
`1829`		`- // Only hide the property if it's a string and if it's part of the original stack`
`1830`		`- if (index !== -1 && (typeof err[name] !== 'string' \|\| StringPrototypeIncludes(stack, err[name]))) {`
`1831`		`- ArrayPrototypeSplice(keys, index, 1);`
`1832`		`- }`
`1833`		`- }`
`1834`		`- }`
`1835`		`-}`
`1836`		`-`
`1837`	`1832`	`function markNodeModules(ctx, line) {`
`1838`	`1833`	`let tempLine = '';`
`1839`	`1834`	`let lastPos = 0;`
`@@ -1916,28 +1911,72 @@ function safeGetCWD() {`
`1916`	`1911`	`}`
`1917`	`1912`
`1918`	`1913`	`function formatError(err, constructor, tag, ctx, keys) {`
`1919`		`- const name = err.name != null ? err.name : 'Error';`
`1920`		`- let stack = getStackString(ctx, err);`
	`1914`	`+ let message, name, stack;`
	`1915`	`+ try {`
	`1916`	`+ stack = getStackString(ctx, err);`
	`1917`	`+ } catch {`
	`1918`	`+ return ObjectPrototypeToString(err);`
	`1919`	`+ }`
`1921`	`1920`
`1922`		`- removeDuplicateErrorKeys(ctx, keys, err, stack);`
	`1921`	`+ let messageIsGetterThatThrows = false;`
	`1922`	`+ try {`
	`1923`	`+ message = err.message;`
	`1924`	`+ } catch {`
	`1925`	`+ messageIsGetterThatThrows = true;`
	`1926`	`+ }`
	`1927`	`+ let nameIsGetterThatThrows = false;`
	`1928`	`+ try {`
	`1929`	`+ name = err.name;`
	`1930`	`+ } catch {`
	`1931`	`+ nameIsGetterThatThrows = true;`
	`1932`	`+ }`
	`1933`	`+`
	`1934`	`+ if (!ctx.showHidden && keys.length !== 0) {`
	`1935`	`+ const index = ArrayPrototypeIndexOf(keys, 'stack');`
	`1936`	`+ if (index !== -1) {`
	`1937`	`+ ArrayPrototypeSplice(keys, index, 1);`
	`1938`	`+ }`
	`1939`	`+`
	`1940`	`+ if (!messageIsGetterThatThrows) {`
	`1941`	`+ const index = ArrayPrototypeIndexOf(keys, 'message');`
	`1942`	`+ // Only hide the property if it's a string and if it's part of the original stack`
	`1943`	`+ if (index !== -1 && (typeof message !== 'string' \|\| StringPrototypeIncludes(stack, message))) {`
	`1944`	`+ ArrayPrototypeSplice(keys, index, 1);`
	`1945`	`+ }`
	`1946`	`+ }`
	`1947`	`+`
	`1948`	`+ if (!nameIsGetterThatThrows) {`
	`1949`	`+ const index = ArrayPrototypeIndexOf(keys, 'name');`
	`1950`	`+ // Only hide the property if it's a string and if it's part of the original stack`
	`1951`	`+ if (index !== -1 && (typeof name !== 'string' \|\| StringPrototypeIncludes(stack, name))) {`
	`1952`	`+ ArrayPrototypeSplice(keys, index, 1);`
	`1953`	`+ }`
	`1954`	`+ }`
	`1955`	`+ }`
	`1956`	`+ name ??= 'Error';`
`1923`	`1957`
`1924`	`1958`	`if ('cause' in err &&`
`1925`	`1959`	`(keys.length === 0 \|\| !ArrayPrototypeIncludes(keys, 'cause'))) {`
`1926`	`1960`	`ArrayPrototypePush(keys, 'cause');`
`1927`	`1961`	`}`
`1928`	`1962`
`1929`	`1963`	`// Print errors aggregated into AggregateError`
`1930`		`- if (ArrayIsArray(err.errors) &&`
	`1964`	`+ try {`
	`1965`	`+ const errors = err.errors;`
	`1966`	`+ if (ArrayIsArray(errors) &&`
`1931`	`1967`	`(keys.length === 0 \|\| !ArrayPrototypeIncludes(keys, 'errors'))) {`
`1932`		`- ArrayPrototypePush(keys, 'errors');`
	`1968`	`+ ArrayPrototypePush(keys, 'errors');`
	`1969`	`+ }`
	`1970`	`+ } catch {`
	`1971`	`+ // If errors is a getter that throws, we ignore the error.`
`1933`	`1972`	`}`
`1934`	`1973`
`1935`	`1974`	`stack = improveStack(stack, constructor, name, tag);`
`1936`	`1975`
`1937`	`1976`	`// Ignore the error message if it's contained in the stack.`
`1938`		`- let pos = (err.message && StringPrototypeIndexOf(stack, err.message)) \|\| -1;`
	`1977`	`+ let pos = (message && StringPrototypeIndexOf(stack, message)) \|\| -1;`
`1939`	`1978`	`if (pos !== -1)`
`1940`		`- pos += err.message.length;`
	`1979`	`+ pos += message.length;`
`1941`	`1980`	`// Wrap the error in brackets in case it has no stack trace.`
`1942`	`1981`	`const stackStart = StringPrototypeIndexOf(stack, '\n at', pos);`
`1943`	`1982`	`if (stackStart === -1) {`

Collapse file

`‎test/parallel/test-util-inspect.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-util-inspect.js

+25Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -3716,3 +3716,28 @@ ${error.stack.split('\n').slice(1).join('\n')}`,
`3716`	`3716`
`3717`	`3717`	`assert.strictEqual(inspect(error), '[Error: foo\n [Error: bar\n [Circular *1]]]');`
`3718`	`3718`	`}`
	`3719`	`+`
	`3720`	`+{`
	`3721`	`+ Object.defineProperty(Error, Symbol.hasInstance,`
	`3722`	`+ { __proto__: null, value: common.mustNotCall(), configurable: true });`
	`3723`	`+ const error = new Error();`
	`3724`	`+`
	`3725`	`+ const throwingGetter = {`
	`3726`	`+ __proto__: null,`
	`3727`	`+ get() {`
	`3728`	`+ throw error;`
	`3729`	`+ },`
	`3730`	`+ configurable: true,`
	`3731`	`+ enumerable: true,`
	`3732`	`+ };`
	`3733`	`+`
	`3734`	`+ Object.defineProperties(error, {`
	`3735`	`+ name: throwingGetter,`
	`3736`	`+ stack: throwingGetter,`
	`3737`	`+ cause: throwingGetter,`
	`3738`	`+ });`
	`3739`	`+`
	`3740`	+ assert.strictEqual(inspect(error), `[object Error] {\n stack: [Getter/Setter],\n name: [Getter],\n cause: [Getter]\n}`);
	`3741`	`+ assert.match(inspect(DOMException.prototype), /^\[object DOMException\] \{/);`
	`3742`	`+ delete Error[Symbol.hasInstance];`
	`3743`	`+}`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.