bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-06 21:45:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove usage of gconv.Unsafe* functions internally to avoid unexpected errors

Browse Source
This commit is contained in:
John Guo
2021-09-14 19:30:20 +08:00
parent 99b6085235
commit 727f58a24b
32 changed files with 63 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
container/gtype/string.go
View File

@ -55,12 +55,12 @@ func (v *String) String() string {
// MarshalJSON implements the interface MarshalJSON for json.Marshal.
func (v *String) MarshalJSON() ([]byte, error) {
return gconv.UnsafeStrToBytes(`"` + v.Val() + `"`), nil
return []byte(`"` + v.Val() + `"`), nil
}
// UnmarshalJSON implements the interface UnmarshalJSON for json.Unmarshal.
func (v *String) UnmarshalJSON(b []byte) error {
v.Set(gconv.UnsafeBytesToStr(bytes.Trim(b, `"`)))
v.Set(string(bytes.Trim(b, `"`)))
return nil
}