Commit 54fdcf7

authored

CSHARP-5493: Fix stackoverflow in EnumRepresentationConvention (#1616)

1 parent bfc43d6 commit 54fdcf7Copy full SHA for 54fdcf7

File tree

+41

-0

lines changed

+41

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`
`16`	`16`	`using System;`
	`17`	`+using System.Collections;`
`17`	`18`
`18`	`19`	`namespace MongoDB.Bson.Serialization.Conventions`
`19`	`20`	`{`
`@@ -67,6 +68,13 @@ public EnumRepresentationConvention(BsonType representation, bool topLevelOnly)`
`67`	`68`	`/// <param name="memberMap">The member map.</param>`
`68`	`69`	`public void Apply(BsonMemberMap memberMap)`
`69`	`70`	`{`
	`71`	`+ var memberType = memberMap.MemberType;`
	`72`	`+`
	`73`	`+ if (!(memberType.IsEnum \|\| memberType.IsNullableEnum() \|\| memberType.IsArray \|\| typeof(IEnumerable).IsAssignableFrom(memberType)))`
	`74`	`+ {`
	`75`	`+ return;`
	`76`	`+ }`
	`77`	`+`
`70`	`78`	`var serializer = memberMap.GetSerializer();`
`71`	`79`	`var reconfiguredSerializer = _topLevelOnly && !serializer.ValueType.IsNullableEnum() ?`
`72`	`80`	`Reconfigure(serializer) :`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`
`16`	`16`	`using System;`
	`17`	`+using System.Collections;`
`17`	`18`	`using System.Collections.Generic;`
`18`	`19`	`using System.Linq;`
`19`	`20`	`using System.Reflection;`
`@@ -152,6 +153,14 @@ public bool AllowDefaultFrameworkTypes`
`152`	`153`	`/// <param name="memberMap">The member map.</param>`
`153`	`154`	`public void Apply(BsonMemberMap memberMap)`
`154`	`155`	`{`
	`156`	`+ var memberType = memberMap.MemberType;`
	`157`	`+`
	`158`	`+ if (memberType != typeof(object) && Nullable.GetUnderlyingType(memberType) == null && !memberType.IsArray &&`
	`159`	`+ !typeof(IEnumerable).IsAssignableFrom(memberType))`
	`160`	`+ {`
	`161`	`+ return;`
	`162`	`+ }`
	`163`	`+`
`155`	`164`	`var serializer = memberMap.GetSerializer();`
`156`	`165`
`157`	`166`	`var reconfiguredSerializer = Reconfigure(serializer);`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public class C`
`41`	`41`	`public int I { get; set; }`
`42`	`42`	`public int NI { get; set; }`
`43`	`43`	`public int[] ArrayInt { get; set; }`
	`44`	`+ public C RecursiveProp { get; set; }`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`[Theory]`
`@@ -204,6 +205,17 @@ public void Apply_should_do_nothing_when_member_is_not_an_enum_collection()`
`204`	`205`	`memberMap.GetSerializer().Should().BeSameAs(serializer);`
`205`	`206`	`}`
`206`	`207`
	`208`	`+ [Fact]`
	`209`	`+ public void Convention_should_work_with_recursive_type()`
	`210`	`+ {`
	`211`	`+ var pack = new ConventionPack { new EnumRepresentationConvention(BsonType.String) };`
	`212`	`+ ConventionRegistry.Register("enumRecursive", pack, t => t == typeof(C));`
	`213`	`+`
	`214`	`+ _ = new BsonClassMap<C>(cm => cm.AutoMap()).Freeze();`
	`215`	`+`
	`216`	`+ ConventionRegistry.Remove("enumRecursive");`
	`217`	`+ }`
	`218`	`+`
`207`	`219`	`[Theory]`
`208`	`220`	`[InlineData((BsonType)0)]`
`209`	`221`	`[InlineData(BsonType.Int32)]`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ private class TestClass`
`31`	`31`	`public object ObjectProp { get; set; }`
`32`	`32`	`public object[] ArrayOfObjectProp { get; set; }`
`33`	`33`	`public object[][] ArrayOfArrayOfObjectProp { get; set; }`
	`34`	`+ public TestClass RecursiveProp { get; set; }`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`[Fact]`
`@@ -344,6 +345,17 @@ public void Convention_should_be_applied_during_automapping()`
`344`	`345`	`ConventionRegistry.Remove(conventionName);`
`345`	`346`	`}`
`346`	`347`
	`348`	`+ [Fact]`
	`349`	`+ public void Convention_should_work_with_recursive_type()`
	`350`	`+ {`
	`351`	`+ var pack = new ConventionPack { new ObjectSerializerAllowedTypesConvention() };`
	`352`	`+ ConventionRegistry.Register("objectRecursive", pack, t => t == typeof(TestClass));`
	`353`	`+`
	`354`	`+ _ = new BsonClassMap<TestClass>(cm => cm.AutoMap()).Freeze();`
	`355`	`+`
	`356`	`+ ConventionRegistry.Remove("enumRecursive");`
	`357`	`+ }`
	`358`	`+`
`347`	`359`	`// private methods`
`348`	`360`	`private static BsonMemberMap CreateMemberMap<TMember>(Expression<Func<TestClass, TMember>> member)`
`349`	`361`	`{`

Comments

(0)