blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

添加类型检查，直接赋值可能会panic

Browse Source
This commit is contained in:
wangweifeng 2025-03-13 22:46:02 +08:00
parent bb696bb281
commit 8a59bf7f15
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/gconv/internal/converter/converter_convert.go
View File

@ -446,8 +446,13 @@ func (c *Converter) doConvertForDefault(in doConvertInput, option ConvertOption)
if err != nil {
return nil, err
}
convertedValue = reflect.ValueOf(result).Convert(referReflectValue.Type()).Interface()
return convertedValue, nil
resultValue := reflect.ValueOf(result)
if resultValue.Type().AssignableTo(referReflectValue.Type()) {
convertedValue = resultValue.Convert(referReflectValue.Type()).Interface()
} else {
convertedValue = reflect.Zero(referReflectValue.Type()).Interface()
}
}
return in.FromValue, nil
}
@ -458,7 +463,12 @@ func (c *Converter) doConvertWithReflectValueSet(reflectValue reflect.Value, in
return err
}
if !in.alreadySetToReferValue {
reflectValue.Set(reflect.ValueOf(convertedValue))
convertedValueValue := reflect.ValueOf(convertedValue)
if convertedValueValue.Type().AssignableTo(reflectValue.Type()) {
reflectValue.Set(convertedValueValue)
} else {
reflectValue.Set(reflect.Zero(reflectValue.Type()))
}
}
return err
}