Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Fixed null value in SetValue

Browse source
This commit is contained in:
Brian Fiete 2020-06-25 05:38:42 -07:00
parent bb0a73f01d
commit e7afee6770
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
BeefLibs/corlib/src/Reflection/FieldInfo.bf
View file

@ -66,6 +66,19 @@ namespace System.Reflection
Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId); Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId);
void* fieldDataAddr = ((uint8*)Internal.UnsafeCastToPtr(obj)) + mFieldData.mDataOffset + dataOffsetAdjust; void* fieldDataAddr = ((uint8*)Internal.UnsafeCastToPtr(obj)) + mFieldData.mDataOffset + dataOffsetAdjust;
if (value == null)
{
if ((fieldType.IsValueType) && (!fieldType.IsPointer))
{
return .Err(.InvalidValueType);
}
else
{
*((int*)fieldDataAddr) = 0;
return .Ok;
}
}
Type rawValueType = value.[Friend]RawGetType(); Type rawValueType = value.[Friend]RawGetType();
void* valueDataAddr = ((uint8*)Internal.UnsafeCastToPtr(value)) + rawValueType.[Friend]mMemberDataOffset; void* valueDataAddr = ((uint8*)Internal.UnsafeCastToPtr(value)) + rawValueType.[Friend]mMemberDataOffset;
@ -86,22 +99,6 @@ namespace System.Reflection
return .Err(.InvalidValueType); return .Err(.InvalidValueType);
} }
/*switch (fieldType.mTypeCode)
{
case .Boolean:
if (!value is bool)
return .Err(.InvalidValueType);
*(bool*)(uint8*)dataAddr = (.)value;
break;
case .Int32:
if (!value is int32)
return .Err(.InvalidValueType);
*(int32*)(uint8*)dataAddr = (.)value;
break;
default:
return .Err(.InvalidValueType);
}*/
return .Ok; return .Ok;
} }