xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: crash when key value is nil

Browse source
This commit is contained in:
gVisor bot 2019-03-25 20:42:20 +08:00
parent 3a065853c4
commit 041702aac6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/structure/structure.go
View file

@ -47,11 +47,11 @@ func (d *Decoder) Decode(src map[string]interface{}, dst interface{}) error {
} }
value, ok := src[key] value, ok := src[key]
if !ok { if !ok || value == nil {
if omitempty { if omitempty {
continue continue
} }
return fmt.Errorf("key %s missing", key) return fmt.Errorf("key '%s' missing", key)
} }
err := d.decode(key, value, v.Field(idx)) err := d.decode(key, value, v.Field(idx))
@ -114,7 +114,7 @@ func (d *Decoder) decodeString(name string, data interface{}, val reflect.Value)
val.SetString(strconv.FormatInt(dataVal.Int(), 10)) val.SetString(strconv.FormatInt(dataVal.Int(), 10))
default: default:
err = fmt.Errorf( err = fmt.Errorf(
"'%s' expected type'%s', got unconvertible type '%s'", "'%s' expected type '%s', got unconvertible type '%s'",
name, val.Type(), dataVal.Type(), name, val.Type(), dataVal.Type(),
) )
} }
@ -131,7 +131,7 @@ func (d *Decoder) decodeBool(name string, data interface{}, val reflect.Value) (
val.SetBool(dataVal.Int() != 0) val.SetBool(dataVal.Int() != 0)
default: default:
err = fmt.Errorf( err = fmt.Errorf(
"'%s' expected type'%s', got unconvertible type '%s'", "'%s' expected type '%s', got unconvertible type '%s'",
name, val.Type(), dataVal.Type(), name, val.Type(), dataVal.Type(),
) )
} }