mirror of
https://github.com/containers/podman.git
synced 2025-11-29 09:37:38 +08:00
fdc738b0df
There is a couple of newGenericDecompressor function usages, where returned possibly non-nil `err` is not checked before dereferencing returned decompressor. It may lead to nil ptr dereferencing. This commit adds check for `err` to prevent dereferencing potentially nullable decompressor. Found by Linux Verification Center (linuxtesting.org) with SVACE Signed-off-by: Mikhail Dmitrichenko <m.dmitrichenko222@gmail.com>
59 lines
1.4 KiB
Go
59 lines
1.4 KiB
Go
package compression
|
|
|
|
import (
|
|
"archive/zip"
|
|
"errors"
|
|
"io"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
type zipDecompressor struct {
|
|
genericDecompressor
|
|
zipReader *zip.ReadCloser
|
|
fileReader io.ReadCloser
|
|
}
|
|
|
|
func newZipDecompressor(compressedFilePath string) (*zipDecompressor, error) {
|
|
d, err := newGenericDecompressor(compressedFilePath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &zipDecompressor{*d, nil, nil}, err
|
|
}
|
|
|
|
// This is the only compressor that doesn't return the compressed file
|
|
// stream (zip.OpenReader() provides access to the decompressed file).
|
|
// As a result the progress bar shows the decompressed file stream
|
|
// but the final size is the compressed file size.
|
|
func (d *zipDecompressor) compressedFileReader() (io.ReadCloser, error) {
|
|
zipReader, err := zip.OpenReader(d.compressedFilePath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
d.zipReader = zipReader
|
|
if len(zipReader.File) != 1 {
|
|
return nil, errors.New("machine image files should consist of a single compressed file")
|
|
}
|
|
z, err := zipReader.File[0].Open()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
d.fileReader = z
|
|
return z, nil
|
|
}
|
|
|
|
func (*zipDecompressor) decompress(w io.WriteSeeker, r io.Reader) error {
|
|
_, err := io.Copy(w, r)
|
|
return err
|
|
}
|
|
|
|
func (d *zipDecompressor) close() {
|
|
if err := d.zipReader.Close(); err != nil {
|
|
logrus.Errorf("Unable to close zip file: %q", err)
|
|
}
|
|
if err := d.fileReader.Close(); err != nil {
|
|
logrus.Errorf("Unable to close zip file: %q", err)
|
|
}
|
|
}
|