Merge pull request #578 from replicatedhq/emosbaugh/sc-48809/analyze-…

…api-fromanalyzerresult-invalid-memory filter nil analyzer results to prevent panic
replicatedhq · May 23, 2022 · c31b803 · c31b803
2 parents 249e52d + 84b4080
commit c31b803
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/pkg/analyze/download.go b/pkg/analyze/download.go
@@ -38,8 +38,11 @@ func AnalyzeLocal(localBundlePath string, analyzers []*troubleshootv1beta2.Analy
 			continue
 		}
 
-		if analyzeResult != nil {
-			analyzeResults = append(analyzeResults, analyzeResult...)
+		// Filter nil results to prevent panic
+		for _, r := range analyzeResult {
+			if r != nil {
+				analyzeResults = append(analyzeResults, r)
+			}
 		}
 	}
 

diff --git a/pkg/convert/supportbundle.go b/pkg/convert/supportbundle.go
@@ -69,6 +69,10 @@ func FromAnalyzerResult(input []*analyze.AnalyzeResult) []*Result {
 
 	result := make([]*Result, 0)
 	for _, i := range input {
+		// Continue on nil result to prevent panic
+		if i == nil {
+			continue
+		}
 		name := reg.ReplaceAllString(strings.ToLower(i.Title), ".")
 		r := &Result{
 			Meta: Meta{