bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-04 13:02:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

no longer use unsafe package for string/bytes conversion

Browse Source
This commit is contained in:
daguang
2022-04-19 17:06:27 +08:00
parent fd92fd2409
commit 308fdccf65
32 changed files with 103 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
os/gres/gres_func.go
View File

@ -11,10 +11,10 @@ import (
"bytes"
"encoding/hex"
"fmt"
"github.com/gogf/gf/encoding/gbase64"
"github.com/gogf/gf/encoding/gcompress"
"github.com/gogf/gf/text/gstr"
"github.com/gogf/gf/util/gconv"
"github.com/gogf/gf/os/gfile"
)
@ -116,7 +116,7 @@ func UnpackContent(content string) ([]*File, error) {
return nil, err
}
} else {
data, err = gcompress.UnGzip(gconv.UnsafeStrToBytes(content))
data, err = gcompress.UnGzip([]byte(content))
if err != nil {
return nil, err
}
@ -166,7 +166,7 @@ func isHexStr(s string) bool {
// hexStrToBytes converts hex string content to []byte.
func hexStrToBytes(s string) []byte {
src := gconv.UnsafeStrToBytes(s)
src := []byte(s)
dst := make([]byte, hex.DecodedLen(len(src)))
hex.Decode(dst, src)
return dst