Merge pull request #750 from ersonp/bug/hypervisor-panic

Solve nil pointer derefrence
skycoin · May 5, 2021 · d3a7d7d · d3a7d7d
2 parents bc08494 + 8e29830
commit d3a7d7d
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/pkg/visor/hypervisor.go b/pkg/visor/hypervisor.go
@@ -535,8 +535,12 @@ func (hv *Hypervisor) getVisorsExtraSummary() http.HandlerFunc {
 		summary, err := hv.visor.ExtraSummary()
 		if err != nil {
 			log.WithError(err).Warn("Failed to obtain summary of this visor.")
-			summary = &ExtraSummary{}
-			summary.Summary.PubKey = hv.visor.conf.PK
+			summary = &ExtraSummary{
+				Summary: &Summary{
+					PubKey: hv.visor.conf.PK,
+				},
+				Health: &HealthInfo{},
+			}
 		}
 
 		addr := dmsg.Addr{PK: hv.c.PK, Port: hv.c.DmsgPort}
@@ -553,9 +557,14 @@ func (hv *Hypervisor) getVisorsExtraSummary() http.HandlerFunc {
 				summary, err := c.API.ExtraSummary()
 				if err != nil {
 					log.WithError(err).
-						Warn("Failed to obtain summary via RPC.")
-					summary = &ExtraSummary{}
-					summary.Summary.PubKey = pk
+						Warn("Failed to obtain summary via RPC.", pk)
+
+					summary = &ExtraSummary{
+						Summary: &Summary{
+							PubKey: pk,
+						},
+						Health: &HealthInfo{},
+					}
 				} else {
 					log.Debug("Obtained summary via RPC.")
 				}
@@ -570,6 +579,8 @@ func (hv *Hypervisor) getVisorsExtraSummary() http.HandlerFunc {
 		for i := 0; i < len(summaries); i++ {
 			if stat, ok := dmsgStats[summaries[i].Summary.PubKey.String()]; ok {
 				summaries[i].DmsgStats = &stat
+			} else {
+				summaries[i].DmsgStats = &dmsgtracker.DmsgClientSummary{}
 			}
 		}