nullable本身是值类型，但如果没有值时boxing后会为null，在clone时应该特殊处理，fix Tencent#210

devcollect · Nov 17, 2020 · eec6828 · eec6828
1 parent 3084863
commit eec6828
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Source/VSProj/Src/Core/VirtualMachine.cs b/Source/VSProj/Src/Core/VirtualMachine.cs
@@ -211,7 +211,8 @@ void store(Value* stackBase, Value* dst, Value* src, object[] managedStack)
  *dst = *src;
  if (dst->Type >= ValueType.Object)
  {
- var obj = (dst->Type == ValueType.ValueType) ? objectClone.Clone(managedStack[src->Value1])
+ var obj = (dst->Type == ValueType.ValueType && managedStack[src->Value1] != null) //Nullable box后可能为空
+ ? objectClone.Clone(managedStack[src->Value1])
  : managedStack[src->Value1];
  var dstPos = dst->Value1 = (int)(dst - stackBase);
  managedStack[dstPos] = obj;
@@ -230,7 +231,9 @@ void copy(Value* stackBase, Value* dst, Value* src, object[] managedStack)
  *dst = *src;
  if (dst->Type == ValueType.ValueType)
  {
- var obj = objectClone.Clone(managedStack[src->Value1]);
+ object obj = null;
+ if (managedStack[src->Value1] != null) //Nullable box后可能为空
+ obj = objectClone.Clone(managedStack[src->Value1]);
  var dstPos = dst->Value1 = (int)(dst - stackBase);
  managedStack[dstPos] = obj;
  }