Merge pull request #2373 from Eneuman/master

Resolves a null pointer exception when returning a Dictionary containing known keys
domaindrivendev · Nov 15, 2022 · 2da3a72 · 2da3a72
2 parents a6d3386 + 0c548a1
commit 2da3a72
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs
@@ -90,7 +90,7 @@ public SchemaGenerator(SchemaGeneratorOptions generatorOptions, ISerializerDataC
                 }
 
                 // NullableAttribute behaves diffrently for Dictionaries
-                if (modelType.IsGenericType && modelType.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+                if (schema.AdditionalPropertiesAllowed && modelType.IsGenericType && modelType.GetGenericTypeDefinition() == typeof(Dictionary<,>))
                 {
                     schema.AdditionalProperties.Nullable = !memberInfo.IsDictionaryValueNonNullable();
                 }