Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 21:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed serialization of null-strings

Browse Source
This commit is contained in:
Simon Lübeß
2023-12-25 18:58:06 +01:00
parent 20814a61b6
commit 7bd69c162f
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Scripting/ScriptInstanceSerializer.bf
+13 -8
View File
@@ -105,17 +105,22 @@ class SerializedObject
if (primitiveType == .String)
{
MonoString* string = (.)value;
char8* rawStringValue = Mono.mono_string_to_utf8(string);
// If the string is null, we store a nullptr and 0-length
StringView valueView = StringView(null, 0);
String stringValue = new String(rawStringValue);
if (value != null)
{
MonoString* string = (.)value;
char8* rawStringValue = Mono.mono_string_to_utf8(string);
_ownedString.Add(stringValue);
String stringValue = new String(rawStringValue);
Mono.mono_free(rawStringValue);
StringView valueView = stringValue;
_ownedString.Add(stringValue);
Mono.mono_free(rawStringValue);
valueView = stringValue;
}
Internal.MemCpy(&data, &valueView, sizeof(StringView));
}
ScriptCore/Serialization/EntitySerializer.cs
+8 -1
View File
@@ -128,7 +128,7 @@ public static class EntitySerializer
}
else if (fieldType == typeof(string))
{
AddField(fieldName, SerializationType.String, fieldValue.ToString());
AddField(fieldName, SerializationType.String, fieldValue);
}
else if (fieldType.IsEnum)
{
@@ -317,8 +317,15 @@ public static class EntitySerializer
{
// rawData contains a Pointer and a string length!
byte* utf8Ptr = *(byte**)rawData;
if (utf8Ptr == null)
return null;
ulong length = *(ulong*)(rawData + 8);
if (length == 0)
return string.Empty;
return Encoding.UTF8.GetString(utf8Ptr, (int)length);
}