From 4245de9ff333a1d34e125ba72c543b6e78db6980 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 14 Feb 2025 10:22:06 -0500
Subject: [PATCH] fix: parsing failure on nodes set to null

---
 .../Reader/ParseNodes/MapNode.cs              |  4 ++--
 .../Reader/MapNodeTests.cs                    | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 test/Microsoft.OpenApi.Tests/Reader/MapNodeTests.cs

diff --git a/src/Microsoft.OpenApi/Reader/ParseNodes/MapNode.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/MapNode.cs
index b71593dca..6aced216f 100644
--- a/src/Microsoft.OpenApi/Reader/ParseNodes/MapNode.cs
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/MapNode.cs
@@ -33,7 +33,7 @@ public MapNode(ParsingContext context, JsonNode node) : base(
             }
 
             _node = mapNode;
-            _nodes = _node.Select(p => new PropertyNode(Context, p.Key, p.Value)).ToList();
+            _nodes = _node.Where(static p => p.Value is not null).Select(p => new PropertyNode(Context, p.Key, p.Value)).ToList();
         }
 
         public PropertyNode this[string key]
@@ -66,7 +66,7 @@ public override Dictionary<string, T> CreateMap<T>(Func<MapNode, OpenApiDocument
                           : default;
                     }
                     finally
-                    {    
+                    {
                         Context.EndObject();
                     }
                     return new
diff --git a/test/Microsoft.OpenApi.Tests/Reader/MapNodeTests.cs b/test/Microsoft.OpenApi.Tests/Reader/MapNodeTests.cs
new file mode 100644
index 000000000..784a6be51
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/MapNodeTests.cs
@@ -0,0 +1,19 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.ParseNodes;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Reader;
+
+public class MapNodeTests
+{
+    [Fact]
+    public void DoesNotFailOnNullValue()
+    {
+        var jsonNode = JsonNode.Parse("{\"key\": null}");
+        var mapNode = new MapNode(new ParsingContext(new()), jsonNode);
+
+        Assert.NotNull(mapNode);
+        Assert.Empty(mapNode);
+    }
+}