Skip to content

Find, verify, and analyze leaked credentials

Use recover to catch panic in dep for old rars (#801)

Bill Richa30b52f9b0a8
diff --git a/pkg/handlers/archive.go b/pkg/handlers/archive.go
index 699ecdb7c..370bc3998 100644
--- a/pkg/handlers/archive.go
+++ b/pkg/handlers/archive.go
@@ -137,6 +137,15 @@ func (d *Archive) extractorHandler(archiveChan chan ([]byte)) func(context.Conte
// ReadToMax reads up to the max size.
func (d *Archive) ReadToMax(reader io.Reader) ([]byte, error) {
+ // Archiver v4 is in alpha and using an experimental version of
+ // rardecode. There is a bug somewhere with rar decoder format 29
+ // that can lead to a panic. An issue is open in rardecode repo
+ // https://github.com/nwaples/rardecode/issues/30.
+ defer func() {
+ if err := recover(); err != nil {
+ log.Errorf("Panic occurred when reading archive: %v", err)
+ }
+ }()
fileContent := bytes.Buffer{}
log.Tracef("Remaining buffer capacity: %d", d.maxSize-d.size)
for i := 0; i <= d.maxSize/512; i++ {