Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license.

using System;
using System.Globalization;
using System.Text;
using Microsoft.OpenApi.Exceptions;
using Microsoft.OpenApi.Properties;
Expand Down Expand Up @@ -74,7 +75,19 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)

case PrimitiveType.Double:
var doubleValue = (OpenApiDouble)(IOpenApiPrimitive)this;
writer.WriteValue(doubleValue.Value);
var actualValue = doubleValue.Value;
if (actualValue.Equals(double.NaN)
|| actualValue.Equals(double.NegativeInfinity)
|| actualValue.Equals(double.PositiveInfinity))
{
// Write out NaN, -Infinity, Infinity as strings
writer.WriteValue(actualValue.ToString(CultureInfo.InvariantCulture));
break;
}
else
{
writer.WriteValue(actualValue);
}
break;

case PrimitiveType.String:
Expand Down
27 changes: 27 additions & 0 deletions test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using FluentAssertions;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi.Writers;
using Newtonsoft.Json;
using Xunit;
Expand Down Expand Up @@ -265,5 +268,29 @@ public void WriteDateTimeAsJsonShouldMatchExpected(DateTimeOffset dateTimeOffset
// Assert
writtenString.Should().Be(expectedString);
}

[Fact]
public void OpenApiJsonWriterOutputsValidJsonValueWhenSchemaHasNanOrInfinityValues()
{
// Arrange
var schema = new OpenApiSchema
{
Enum = new List<IOpenApiAny> {
new OpenApiDouble(double.NaN),
new OpenApiDouble(double.PositiveInfinity),
new OpenApiDouble(double.NegativeInfinity)
}
};

// Act
var schemaBuilder = new StringBuilder();
var jsonWriter = new OpenApiJsonWriter(new StringWriter(schemaBuilder));
schema.SerializeAsV3(jsonWriter);
var jsonString = schemaBuilder.ToString();

// Assert
var exception = Record.Exception(() => System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(jsonString));
Assert.Null(exception);
}
}
}