util,assert: fix boxed primitives bug

Currently the comparison could throw an error in case a boxed primitive has no valueOf function on one side of the assert call. PR-URL: #22243 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: George Adams <[email protected]>
nodejs · Aug 15, 2018 · f1c22ea · f1c22ea
1 parent 2d1c185
commit f1c22ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
@@ -120,6 +120,9 @@ function strictDeepEqual(val1, val2, memos) {
     const val1Value = val1.valueOf();
     // Note: Boxed string keys are going to be compared again by Object.keys
     if (val1Value !== val1) {
+      if (typeof val2.valueOf !== 'function') {
+        return false;
+      }
       if (!innerDeepEqual(val1Value, val2.valueOf(), true))
         return false;
       // Fast path for boxed primitives

diff --git a/test/parallel/test-assert-deep.js b/test/parallel/test-assert-deep.js
@@ -931,3 +931,10 @@ assert.throws(() => assert.deepStrictEqual(new Boolean(true), {}),
   );
   util.inspect.defaultOptions = tmp;
 }
+
+// Basic valueOf check.
+{
+  const a = new String(1);
+  a.valueOf = undefined;
+  assertNotDeepOrStrict(a, new String(1));
+}