Merge pull request #808 from tomer-amir/fix-hash-code-infinite-recursion

Fix infinite recursion of the hash code function of YamlMappingNode +semver:fix
aaubry · May 29, 2024 · 53cfe3e · 53cfe3e
2 parents 22070fd + 057a9c0
commit 53cfe3e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/YamlDotNet.Test/RepresentationModel/YamlStreamTests.cs b/YamlDotNet.Test/RepresentationModel/YamlStreamTests.cs
@@ -47,22 +47,26 @@ public void LoadSimpleDocument()
             Assert.Equal(YamlNodeType.Scalar, stream.Documents[0].RootNode.NodeType);
         }
 
-        [Fact]
-        public void AccessingAllNodesOnInfinitelyRecursiveDocumentThrows()
+        [Theory]
+        [InlineData("&a [*a]")]
+        [InlineData("?\n  key: &id1\n    recursion: *id1\n: foo")]
+        public void AccessingAllNodesOnInfinitelyRecursiveDocumentThrows(string yaml)
         {
             var stream = new YamlStream();
-            stream.Load(Yaml.ParserForText("&a [*a]"));
+            stream.Load(Yaml.ParserForText(yaml));
 
             var accessAllNodes = new Action(() => stream.Documents.Single().AllNodes.ToList());
 
             accessAllNodes.ShouldThrow<MaximumRecursionLevelReachedException>("because the document is infinitely recursive.");
         }
 
-        [Fact]
-        public void InfinitelyRecursiveNodeToStringSucceeds()
+        [Theory]
+        [InlineData("&a [*a]")]
+        [InlineData("?\n  key: &id1\n    recursion: *id1\n: foo")]
+        public void InfinitelyRecursiveNodeToStringSucceeds(string yaml)
         {
             var stream = new YamlStream();
-            stream.Load(Yaml.ParserForText("&a [*a]"));
+            stream.Load(Yaml.ParserForText(yaml));
 
             var toString = stream.Documents.Single().RootNode.ToString();
 

diff --git a/YamlDotNet/RepresentationModel/YamlMappingNode.cs b/YamlDotNet/RepresentationModel/YamlMappingNode.cs
@@ -297,7 +297,9 @@ public override int GetHashCode()
             foreach (var entry in children)
             {
                 hashCode = CombineHashCodes(hashCode, entry.Key);
-                hashCode = CombineHashCodes(hashCode, entry.Value);
+                hashCode = entry.Value.Anchor.IsEmpty
+                    ? CombineHashCodes(hashCode, entry.Value)
+                    : CombineHashCodes(hashCode, entry.Value.Anchor);
             }
             return hashCode;
         }