zishuo/unpackit
1
0
Fork 0
mirror of https://github.com/c4milo/unpackit.git synced 2025-09-26 19:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix error reporting for reader

Browse Source 
since it was never making out of the local scope.
This commit is contained in:
Camilo Aguilar
2022-10-04 11:48:52 -04:00
parent da7322c1eb
commit af9d87f400
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unpackit.go
View File

@@ -170,8 +170,8 @@ func Unpack(reader io.Reader, destPath string) error {
// reading the entire zip file in memory.
func Unzip(r io.Reader, destPath string) error {
var (
zr *zip.Reader
err error
zr *zip.Reader
readerErr error
)
if f, ok := r.(*os.File); ok {
@@ -179,18 +179,18 @@ func Unzip(r io.Reader, destPath string) error {
if err != nil {
return err
}
zr, err = zip.NewReader(f, fstat.Size())
zr, readerErr = zip.NewReader(f, fstat.Size())
} else {
data, err := io.ReadAll(r)
if err != nil {
return err
}
memReader := bytes.NewReader(data)
zr, err = zip.NewReader(memReader, memReader.Size())
zr, readerErr = zip.NewReader(memReader, memReader.Size())
}
if err != nil {
return err
if readerErr != nil {
return readerErr
}
return unpackZip(zr, destPath)