trufflesecurity/trufflehog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return an error from ReadToMax when it panics (#925)

Browse Source
This commit is contained in:
Miccah
2022-11-16 14:24:05 -06:00
committed by GitHub
parent eb4ff435a5
commit b3d3f531a4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/handlers/archive.go
+9 -3
View File
@@ -136,14 +136,20 @@ func (d *Archive) extractorHandler(archiveChan chan ([]byte)) func(context.Conte
} }
// ReadToMax reads up to the max size. // ReadToMax reads up to the max size.
func (d *Archive) ReadToMax(reader io.Reader) ([]byte, error) { func (d *Archive) ReadToMax(reader io.Reader) (data []byte, err error) {
// Archiver v4 is in alpha and using an experimental version of // Archiver v4 is in alpha and using an experimental version of
// rardecode. There is a bug somewhere with rar decoder format 29 // rardecode. There is a bug somewhere with rar decoder format 29
// that can lead to a panic. An issue is open in rardecode repo // that can lead to a panic. An issue is open in rardecode repo
// https://github.com/nwaples/rardecode/issues/30. // https://github.com/nwaples/rardecode/issues/30.
defer func() { defer func() {
if err := recover(); err != nil { if r := recover(); r != nil {
log.Errorf("Panic occurred when reading archive: %v", err) log.Errorf("Panic occurred when reading archive: %v", r)
// Return an error from ReadToMax.
if e, ok := r.(error); ok {
err = e
} else {
err = fmt.Errorf("Panic occurred: %v", r)
}
} }
}() }()
fileContent := bytes.Buffer{} fileContent := bytes.Buffer{}