Merge pull request #2373 from Eneuman/master

domaindrivendev · web-flow · commit 2da3a72cf507 · 2022-11-15T21:18:26.000Z
Resolves a null pointer exception when returning a Dictionary containing known keys
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs
@@ -90,7 +90,7 @@ private OpenApiSchema GenerateSchemaForMember(
                 }
 
                 // 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();
                 }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private OpenApiSchema GenerateSchemaForMember(`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// NullableAttribute behaves diffrently for Dictionaries`
`93`		`- if (modelType.IsGenericType && modelType.GetGenericTypeDefinition() == typeof(Dictionary<,>))`
	`93`	`+ if (schema.AdditionalPropertiesAllowed && modelType.IsGenericType && modelType.GetGenericTypeDefinition() == typeof(Dictionary<,>))`
`94`	`94`	`{`
`95`	`95`	`schema.AdditionalProperties.Nullable = !memberInfo.IsDictionaryValueNonNullable();`
`96`	`96`	`}`