Initialize complex structures

Fixes crash bug when attempting to (de)serialize a structure or packet that contains nested structures.
ethanmoffat · May 24, 2024 · d5969f8 · d5969f8
1 parent 09ca2ad
commit d5969f8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/ProtocolGenerator/Model/Protocol/BaseInstruction.cs b/ProtocolGenerator/Model/Protocol/BaseInstruction.cs
@@ -230,6 +230,13 @@ protected virtual void GenerateProperty(GeneratorState state, string defaultValu
         }
         state.Text(" ", indented: false);
         state.EndBlock(newLine: false, indented: false);
+
+        var needsInitialization = TypeInfo.EoType.HasFlag(EoType.Struct) && !TypeInfo.IsArray && !TypeInfo.IsInterface && !TypeInfo.IsEnum;
+        if (string.IsNullOrWhiteSpace(defaultValue) && needsInitialization)
+        {
+            defaultValue = $"new {TypeInfo.PropertyType}()";
+        }
+
         if (!string.IsNullOrWhiteSpace(defaultValue))
         {
             state.Text($" = {defaultValue};", indented: false);

diff --git a/ProtocolGenerator/Model/Protocol/SwitchInstruction.cs b/ProtocolGenerator/Model/Protocol/SwitchInstruction.cs
@@ -13,7 +13,7 @@ public SwitchInstruction(Xml.ProtocolSwitchInstruction xmlSwitchInstruction)
     {
         _xmlSwitchInstruction = xmlSwitchInstruction;
 
-        TypeInfo = new TypeInfo(GetSwitchInterfaceType(_xmlSwitchInstruction.Field));
+        TypeInfo = new TypeInfo(GetSwitchInterfaceType(_xmlSwitchInstruction.Field), isInterface: true);
         Name = GetSwitchInterfaceMemberName(_xmlSwitchInstruction.Field);
         _fieldName = IdentifierConverter.SnakeCaseToPascalCase(_xmlSwitchInstruction.Field);
     }

diff --git a/ProtocolGenerator/Types/TypeInfo.cs b/ProtocolGenerator/Types/TypeInfo.cs
@@ -16,13 +16,15 @@ public class TypeInfo
 
     public bool IsArray { get; }
 
+    public bool IsInterface { get; }
+
     public bool Optional { get; }
 
     public bool IsEnum { get; }
 
     public bool IsNullable { get; }
 
-    public TypeInfo(string rawType, bool isArray = false, bool optional = false, bool padded = false, bool @fixed = false)
+    public TypeInfo(string rawType, bool isArray = false, bool isInterface = false, bool optional = false, bool padded = false, bool @fixed = false)
     {
         ProtocolTypeName = GetTypeName(rawType);
         ProtocolTypeSize = GetTypeSize(rawType);
@@ -31,6 +33,7 @@ public TypeInfo(string rawType, bool isArray = false, bool optional = false, boo
 
         PropertyType = GetDotNetType(ProtocolTypeName, isArray, optional);
         IsArray = isArray;
+        IsInterface = isInterface;
         Optional = optional;
         IsEnum = TypeMapper.Instance.HasEnum(ProtocolTypeName);