test/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf.git synced 2024-11-30 03:07:45 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

fix issue in gconv.Struct* functions panic when converting attribute value is nil

Browse Source
This commit is contained in:
John 2020-02-05 22:06:24 +08:00
parent b15075fdfe
commit 1999ef95c1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/gconv/gconv_struct.go
View File

@ -9,6 +9,7 @@ package gconv
import (
"errors"
"fmt"
"github.com/gogf/gf/internal/empty"
"reflect"
"regexp"
"strings"
@ -223,7 +224,7 @@ func bindVarToStructAttr(elem reflect.Value, name string, value interface{}) (er
err = bindVarToReflectValue(structFieldValue, value)
}
}()
if value == nil {
if empty.IsNil(value) {
structFieldValue.Set(reflect.Zero(structFieldValue.Type()))
} else {
structFieldValue.Set(reflect.ValueOf(Convert(value, structFieldValue.Type().String())))
@ -246,7 +247,7 @@ func bindVarToStructByIndex(elem reflect.Value, index int, value interface{}) (e
err = bindVarToReflectValue(structFieldValue, value)
}
}()
if value == nil {
if empty.IsNil(value) {
structFieldValue.Set(reflect.Zero(structFieldValue.Type()))
} else {
structFieldValue.Set(reflect.ValueOf(Convert(value, structFieldValue.Type().String())))