Fix matcher cyclic object infinite recursion issue (#245)

* Update match-object.js * Update create-matcher.test.js
sinonjs · Sep 12, 2024 · 153c0a7 · 153c0a7
1 parent ee12a15
commit 153c0a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/create-matcher.test.js b/lib/create-matcher.test.js
@@ -129,6 +129,14 @@ describe("matcher", function () {
         assert(match.test({ deep: { str: "sinon", ignored: "value" } }));
     });
 
+    it("returns true for partial matching cyclic object", function () {
+        var cyclicObj = { a: null };
+        cyclicObj.a = cyclicObj;
+        var match = createMatcher({ b: cyclicObj });
+
+        assert(match.test({ b: cyclicObj, c: "c" }));
+    });
+
     it("returns false if a property is not equal", function () {
         var match = createMatcher({ str: "sinon", nr: 1 });
 

diff --git a/lib/create-matcher/match-object.js b/lib/create-matcher/match-object.js
@@ -6,6 +6,7 @@ var typeOf = require("@sinonjs/commons").typeOf;
 
 var deepEqualFactory = require("../deep-equal").use;
 
+var identical = require("../identical");
 var isMatcher = require("./is-matcher");
 
 var keys = Object.keys;
@@ -41,6 +42,9 @@ function matchObject(actual, expectation, matcher) {
                 return false;
             }
         } else if (typeOf(exp) === "object") {
+            if (identical(exp, act)) {
+                return true;
+            }
             if (!matchObject(act, exp, matcher)) {
                 return false;
             }