Fix handling of nil

enbility · Dec 30, 2023 · f2e2918 · f2e2918
1 parent 64c207f
commit f2e2918
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/spine/model/commandframe_additions.go b/spine/model/commandframe_additions.go
@@ -99,9 +99,16 @@ func (f *FilterType) SetDataForFunction(tagType EEBusTagTypeType, fct FunctionTy
 			break
 		}
 
+		if data == nil || (reflect.ValueOf(data).Kind() == reflect.Ptr && reflect.ValueOf(data).IsNil()) {
+			typ := reflect.TypeOf(data).Elem()
+			ff.Set(reflect.New(typ))
+			return
+		}
+
 		dataV := reflect.ValueOf(data)
 		dataC := dataV.Convert(ff.Type())
 		ff.Set(dataC)
+		return
 	}
 }
 
@@ -201,9 +208,16 @@ func (cmd *CmdType) SetDataForFunction(fct FunctionType, data any) {
 			break
 		}
 
+		if data == nil || (reflect.ValueOf(data).Kind() == reflect.Ptr && reflect.ValueOf(data).IsNil()) {
+			typ := reflect.TypeOf(data).Elem()
+			ff.Set(reflect.New(typ))
+			return
+		}
+
 		dataV := reflect.ValueOf(data)
 		dataC := dataV.Convert(ff.Type())
 		ff.Set(dataC)
+		return
 	}
 }