assert: refactor to avoid unsafe array iteration

aduh95 · targos · commit cfff3b4462dd · 2021-06-11T09:30:00.000+02:00
PR-URL: #37344 Reviewed-By: Darshan Sen <raisinten@gmail.com>
diff --git a/lib/internal/assert/assertion_error.js b/lib/internal/assert/assertion_error.js
@@ -313,6 +313,17 @@ function createErrDiff(actual, expected, operator) {
 return `${msg}${skipped ? skippedMsg : ''}\n${res}${other}${end}${indicator}`;
 }
 
+function addEllipsis(string) {
+ const lines = StringPrototypeSplit(string, '\n', 11);
+ if (lines.length > 10) {
+ lines.length = 10;
+ return `${ArrayPrototypeJoin(lines, '\n')}\n...`;
+ } else if (string.length > 512) {
+ return `${StringPrototypeSlice(string, 512)}...`;
+ }
+ return string;
+}
+
 class AssertionError extends Error {
 constructor(options) {
 if (typeof options !== 'object' || options === null) {
@@ -469,16 +480,11 @@ class AssertionError extends Error {
 const tmpActual = this.actual;
 const tmpExpected = this.expected;
 
- for (const name of ['actual', 'expected']) {
- if (typeof this[name] === 'string') {
- const lines = StringPrototypeSplit(this[name], '\n');
- if (lines.length > 10) {
- lines.length = 10;
- this[name] = `${ArrayPrototypeJoin(lines, '\n')}\n...`;
- } else if (this[name].length > 512) {
- this[name] = `${StringPrototypeSlice(this[name], 512)}...`;
- }
- }
+ if (typeof this.actual === 'string') {
+ this.actual = addEllipsis(this.actual);
+ }
+ if (typeof this.expected === 'string') {
+ this.expected = addEllipsis(this.expected);
 }
 
 // This limits the `actual` and `expected` property default inspection to

-Original file line number
+Diff line change
 return`${msg}${skipped ? skippedMsg : ''}\n${res}${other}${end}${indicator}`;
+}
 +functionaddEllipsis(string){
 +constlines=StringPrototypeSplit(string,'\n',11);
 +if(lines.length>10){
 +lines.length=10;
 +return`${ArrayPrototypeJoin(lines,'\n')}\n...`;
 +}elseif(string.length>512){
 +return`${StringPrototypeSlice(string,512)}...`;
 +}
 +returnstring;
 +}
++
 classAssertionErrorextendsError{
 constructor(options){
 if(typeofoptions!=='object'||options===null){
 consttmpActual=this.actual;
 consttmpExpected=this.expected;
 -for(constnameof['actual','expected']){
 -if(typeofthis[name]==='string'){
 -constlines=StringPrototypeSplit(this[name],'\n');
 -if(lines.length>10){
 -lines.length=10;
 -this[name]=`${ArrayPrototypeJoin(lines,'\n')}\n...`;
 -}elseif(this[name].length>512){
 -this[name]=`${StringPrototypeSlice(this[name],512)}...`;
 -}
 -}
 +if(typeofthis.actual==='string'){
 +this.actual=addEllipsis(this.actual);
 +}
 +if(typeofthis.expected==='string'){
 +this.expected=addEllipsis(this.expected);
+}
 // This limits the `actual` and `expected` property default inspection to