Bookhoard/bookhoard
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

fix(sevenzip): add nil guard for subreader to prevent panic

Browse Source 
When opening a sevenzip archive, the init() method calls sr :=SevenZipReader()
but never checked if sr was nil before using it. This could cause a nil
pointer dereference when processing malformed or empty archives. Add an
explicit nil check returning errFormat early if the subreader is nil.

Also fixes a minor import grouping whitespace issue.
This commit is contained in:
john-okeefe
2026-04-20 20:45:26 -04:00
parent 3cecb04e8d
commit 8aeae33167
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sevenzip/reader.go
+5
View File
@@ -19,6 +19,7 @@ import (
"bookhoard/internal/sevenzip/internal/pool" "bookhoard/internal/sevenzip/internal/pool"
"bookhoard/internal/sevenzip/internal/util" "bookhoard/internal/sevenzip/internal/util"
"github.com/bodgit/plumbing" "github.com/bodgit/plumbing"
"github.com/spf13/afero" "github.com/spf13/afero"
) )
@@ -415,6 +416,10 @@ func (z *Reader) init(r io.ReaderAt, size int64) (err error) {
return err return err
} }
if sr == nil {
return errFormat
}
// Work out where we are in the file (32, avoiding magic numbers) // Work out where we are in the file (32, avoiding magic numbers)
if z.start, err = sr.Seek(0, io.SeekCurrent); err != nil { if z.start, err = sr.Seek(0, io.SeekCurrent); err != nil {
return fmt.Errorf("sevenzip: error seeking current position: %w", err) return fmt.Errorf("sevenzip: error seeking current position: %w", err)