Skip to content
This repository was archived by the owner on May 16, 2022. It is now read-only.

Fix inifinite loop during serializer validation (issue #74) and errors in code #76

Open
nsentinel wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix inifinite loop during serializer validation (issue #74) and errors in code #76

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29cdaee
Fix Abstract properties are not Serialized and Deserialized and seria…
nsentinel Jun 4, 2017
270f804
Fix stack imbalance after emitting and opcode used to create new Arra…
nsentinel Jun 4, 2017
82eaa5c
Fix inconsistent method naming used to concatenate string during crea…
nsentinel Jun 4, 2017
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
11 changes: 6 additions & 5 deletions src/ZeroFormatter/Formatters/DynamicFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ public static Tuple<int, EmittableMemberInfo>[] GetMembers(Type resolverType, Ty
foundUnionKey = true;
break;
}

if (propInfo.GetCustomAttributes(typeof(IgnoreFormatAttribute), true).Any()) break;

propInfo = null;

var baseType = item.DeclaringType.GetTypeInfo().BaseType;
Expand Down Expand Up @@ -402,16 +405,14 @@ static TypeInfo BuildFormatter(ModuleBuilder builder, Type resolverType, Type el
{
il.MarkLabel(labelA);

il.Emit(OpCodes.Ldloca_S, (byte)0);
il.Emit(OpCodes.Ldarg_3);
il.Emit(OpCodes.Ldarg_1);
il.Emit(OpCodes.Ldind_Ref);
il.Emit(OpCodes.Ldarg_2);
il.Emit(OpCodes.Ldarg_S, (byte)4);
il.Emit(OpCodes.Ldind_I4);
il.Emit(OpCodes.Call, typeof(ArraySegment<byte>).GetTypeInfo().GetConstructor(new[] { typeof(byte[]), typeof(int), typeof(int) }));
il.Emit(OpCodes.Newobj, typeof(ArraySegment<byte>).GetTypeInfo().GetConstructor(new[] { typeof(byte[]), typeof(int), typeof(int) }));

il.Emit(OpCodes.Ldarg_3);
il.Emit(OpCodes.Ldloc_0);
var ti = typeof(DynamicObjectSegmentBuilder<,>).MakeGenericType(resolverType, elementType).GetTypeInfo().GetMethod("GetProxyType").Invoke(null, null) as TypeInfo;
il.Emit(OpCodes.Newobj, ti.GetConstructor(new[] { typeof(DirtyTracker), typeof(ArraySegment<byte>) }));
il.Emit(OpCodes.Ret);
Expand Down Expand Up @@ -936,7 +937,7 @@ static TypeInfo BuildFormatter(Type resolverType, Type buildType, PropertyInfo u
il.Emit(OpCodes.Ldarg_3);
il.Emit(OpCodes.Callvirt, typeof(Object).GetTypeInfo().GetMethod("GetType"));
il.Emit(OpCodes.Callvirt, typeof(Type).GetTypeInfo().GetProperty("FullName").GetGetMethod());
il.Emit(OpCodes.Call, typeof(string).GetTypeInfo().GetMethods().First(x => x.GetParameters().Length == 2 && x.GetParameters().All(y => y.ParameterType == typeof(string))));
il.Emit(OpCodes.Call, typeof(string).GetTypeInfo().GetMethod("Concat", new[] {typeof(string), typeof(string)}));
il.Emit(OpCodes.Newobj, typeof(Exception).GetTypeInfo().GetConstructors().First(x => x.GetParameters().Length == 1));
il.Emit(OpCodes.Throw);
}
Expand Down