Skip to content

Init out struct parameters to prevent NullReferenceException #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UlyssesWu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Init out struct parameters to prevent NullReferenceException #409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions Source/VSProj/Src/Tools/CodeTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,26 @@ unsafe MethodIdInfo getMethodId(MethodReference callee, MethodDefinition caller,
}
}

//修复out struct问题
for (int i = 0; i < method.Parameters.Count; i++)
{
var parameter = method.Parameters[i];
if (parameter.IsOut && parameter.ParameterType.GetElementType().IsValueType && !parameter.ParameterType.GetElementType().IsPrimitive)
{
code.Add(new Core.Instruction
{
Code = Core.Code.Ldarg,
Operand = i + (method.HasThis ? 1 : 0)
});
code.Add(new Core.Instruction
{
Code = Core.Code.Initobj,
Operand = addExternType(parameter.ParameterType.GetElementType())
});
offsetAdd += 2;
}
}

if (offsetAdd > 0)
{
var ilNewOffset = new Dictionary<Instruction, int>();
Expand Down