From 4cee8b7e358edf73de85353d20176dcec0462339 Mon Sep 17 00:00:00 2001
From: Jordan Doig <jordan.steele.doig@gmail.com>
Date: Thu, 7 Jan 2021 20:40:22 -0700
Subject: [PATCH] Some nil pointer dereference fixes

---
 pkg/dashboard/templates/dashboard.gohtml | 50 +++++++++++++-----------
 pkg/validator/summary.go                 |  8 +++-
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/pkg/dashboard/templates/dashboard.gohtml b/pkg/dashboard/templates/dashboard.gohtml
index 0665e94a..55a1fff2 100644
--- a/pkg/dashboard/templates/dashboard.gohtml
+++ b/pkg/dashboard/templates/dashboard.gohtml
@@ -141,9 +141,11 @@
             <div class="status-bar">
               <div class="status">
                 <div class="failing">
-                  <div class="warning" style="width: {{ getWarningWidth .PodResult.GetSummary 200 }}px;">
-                    <div class="passing" style="width: {{ getSuccessWidth .PodResult.GetSummary 200 }}px;"></div>
-                  </div>
+                  {{ if .PodResult }}
+                    <div class="warning" style="width: {{ getWarningWidth .PodResult.GetSummary 200 }}px;">
+                      <div class="passing" style="width: {{ getSuccessWidth .PodResult.GetSummary 200 }}px;"></div>
+                    </div>
+                  {{ end }}
                 </div>
               </div>
             </div>
@@ -192,26 +194,28 @@
                 </div>
               {{ end }}
 
-              {{ range .PodResult.ContainerResults }}
-                <div class="result-messages expandable-content">
-                  <h4>Container {{ .Name }}:
-                    {{ if eq 0 (len .Results.GetSortedResults) }}
-                      <i>no checks applied</i>
-                    {{ end }}
-                  </h4>
-                  <ul class="message-list">
-                    {{ range $message := .Results.GetSortedResults }}
-                      <li class="{{ getResultClass . }}">
-                        <i class="message-icon {{ getIcon $message }}"></i>
-                        <span class="message">{{ .Message }}</span>
-                        <a class="more-info" href="{{ getCategoryLink .Category }}" target="_blank">
-                          <i class="far fa-question-circle"></i>
-                        </a>
-                      </li>
-                    {{ end }}
-                  </ul>
-                </div>
-              {{ end }} {{/* end range .PodResult.ContainerResults */}}
+              {{ if .PodResult }}
+                {{ range .PodResult.ContainerResults }}
+                  <div class="result-messages expandable-content">
+                    <h4>Container {{ .Name }}:
+                      {{ if eq 0 (len .Results.GetSortedResults) }}
+                        <i>no checks applied</i>
+                      {{ end }}
+                    </h4>
+                    <ul class="message-list">
+                      {{ range $message := .Results.GetSortedResults }}
+                        <li class="{{ getResultClass . }}">
+                          <i class="message-icon {{ getIcon $message }}"></i>
+                          <span class="message">{{ .Message }}</span>
+                          <a class="more-info" href="{{ getCategoryLink .Category }}" target="_blank">
+                            <i class="far fa-question-circle"></i>
+                          </a>
+                        </li>
+                      {{ end }}
+                    </ul>
+                  </div>
+                {{ end }} {{/* end range .PodResult.ContainerResults */}}
+              {{ end }} {{/* end if .PodResult */}}
             </div>
         {{ end }} {{/* end range .Results.GetSortedResults */}}
       </div>
diff --git a/pkg/validator/summary.go b/pkg/validator/summary.go
index 6ff3416b..4be51d6c 100644
--- a/pkg/validator/summary.go
+++ b/pkg/validator/summary.go
@@ -121,7 +121,9 @@ func (c Result) GetSummaryByCategory() CountSummaryByCategory {
 func (a AuditData) GetSummary() CountSummary {
 	summary := CountSummary{}
 	for _, ctrlResult := range a.Results {
-		summary.AddSummary(ctrlResult.GetSummary())
+		if ctrlResult.PodResult != nil {
+			summary.AddSummary(ctrlResult.GetSummary())
+		}
 	}
 	return summary
 }
@@ -130,7 +132,9 @@ func (a AuditData) GetSummary() CountSummary {
 func (a AuditData) GetSummaryByCategory() CountSummaryByCategory {
 	summaries := CountSummaryByCategory{}
 	for _, ctrlResult := range a.Results {
-		summaries.AddSummary(ctrlResult.GetSummaryByCategory())
+		if ctrlResult.PodResult != nil {
+			summaries.AddSummary(ctrlResult.GetSummaryByCategory())
+		}
 	}
 	return summaries
 }