Merge "[FAB-5339] Add missing nil check to extensions.go"

hyperledger · Jul 18, 2017 · 97d4846 · 97d4846
2 parents 2967a0b + 3cde835
commit 97d4846
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/protos/gossip/extensions.go b/protos/gossip/extensions.go
@@ -521,7 +521,7 @@ func (m *SignedGossipMessage) String() string {
 		var isSimpleMsg bool
 		if m.GetStateResponse() != nil {
 			gMsg = fmt.Sprintf("StateResponse with %d items", len(m.GetStateResponse().Payloads))
-		} else if m.IsDataMsg() {
+		} else if m.IsDataMsg() && m.GetDataMsg().Payload != nil {
 			gMsg = m.GetDataMsg().Payload.toString()
 		} else if m.IsDataUpdate() {
 			update := m.GetDataUpdate()

diff --git a/protos/gossip/extensions_test.go b/protos/gossip/extensions_test.go
@@ -72,6 +72,10 @@ func TestToString(t *testing.T) {
 		},
 	}
 	assert.NotContains(t, fmt.Sprintf("%v", sMsg), "2")
+	sMsg.GetDataMsg().Payload = nil
+	assert.NotPanics(t, func() {
+		_ = sMsg.String()
+	})
 
 	sMsg = &SignedGossipMessage{
 		GossipMessage: &GossipMessage{