Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

ToString protection against null type

Browse source
This commit is contained in:
Brian Fiete 2024-04-27 08:38:25 -04:00
parent 3f4988cbd5
commit da9e9120c0
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
BeefLibs/corlib/src/Object.bf
View file

@ -144,18 +144,25 @@ namespace System
NumberFormatter.AddrToString((uint)Internal.UnsafeCastToPtr(this), strBuffer); NumberFormatter.AddrToString((uint)Internal.UnsafeCastToPtr(this), strBuffer);
#else #else
let t = RawGetType(); let t = RawGetType();
if (t.IsBoxedStructPtr) if (t == null)
{ {
let ti = (TypeInstance)t; strBuffer.AppendF($"Type#{(Int.Simple)GetTypeId()}");
let innerPtr = *(void**)((uint8*)Internal.UnsafeCastToPtr(this) + ti.[Friend]mMemberDataOffset); }
strBuffer.Append("("); else
ti.UnderlyingType.GetFullName(strBuffer); {
//strBuffer.AppendF("*)0x{0:A}", (UInt.Simple)(uint)(void*)innerPtr); if (t.IsBoxedStructPtr)
strBuffer.Append("*)0x"); {
NumberFormatter.AddrToString((uint)(void*)innerPtr, strBuffer); let ti = (TypeInstance)t;
return; let innerPtr = *(void**)((uint8*)Internal.UnsafeCastToPtr(this) + ti.[Friend]mMemberDataOffset);
strBuffer.Append("(");
ti.UnderlyingType.GetFullName(strBuffer);
//strBuffer.AppendF("*)0x{0:A}", (UInt.Simple)(uint)(void*)innerPtr);
strBuffer.Append("*)0x");
NumberFormatter.AddrToString((uint)(void*)innerPtr, strBuffer);
return;
}
t.GetFullName(strBuffer);
} }
t.GetFullName(strBuffer);
strBuffer.Append("@0x"); strBuffer.Append("@0x");
NumberFormatter.AddrToString((uint)Internal.UnsafeCastToPtr(this), strBuffer); NumberFormatter.AddrToString((uint)Internal.UnsafeCastToPtr(this), strBuffer);
#endif #endif