Skip to content

Commit af9d87f

Browse files
committed
Fix error reporting for reader
since it was never making out of the local scope.
1 parent da7322c commit af9d87f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

unpackit.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,27 +170,27 @@ func Unpack(reader io.Reader, destPath string) error {
170170
// reading the entire zip file in memory.
171171
func Unzip(r io.Reader, destPath string) error {
172172
var (
173-
zr *zip.Reader
174-
err error
173+
zr *zip.Reader
174+
readerErr error
175175
)
176176

177177
if f, ok := r.(*os.File); ok {
178178
fstat, err := f.Stat()
179179
if err != nil {
180180
return err
181181
}
182-
zr, err = zip.NewReader(f, fstat.Size())
182+
zr, readerErr = zip.NewReader(f, fstat.Size())
183183
} else {
184184
data, err := io.ReadAll(r)
185185
if err != nil {
186186
return err
187187
}
188188
memReader := bytes.NewReader(data)
189-
zr, err = zip.NewReader(memReader, memReader.Size())
189+
zr, readerErr = zip.NewReader(memReader, memReader.Size())
190190
}
191191

192-
if err != nil {
193-
return err
192+
if readerErr != nil {
193+
return readerErr
194194
}
195195

196196
return unpackZip(zr, destPath)

0 commit comments

Comments
 (0)