Skip to content

Commit 73735cc

Browse files
committed
[FAB-13251] Add nil check in ToGossipMessage
Change-Id: I4b7dac64775107d88b0807a4e5f058222e6b8d2f Signed-off-by: yacovm <yacovm@il.ibm.com>
1 parent 14b1e17 commit 73735cc

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

protos/gossip/extensions.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,9 @@ func (m *SignedGossipMessage) IsSigned() bool {
440440
// SignedGossipMessage out of it.
441441
// Returns an error if un-marshaling fails.
442442
func (e *Envelope) ToGossipMessage() (*SignedGossipMessage, error) {
443+
if e == nil {
444+
return nil, errors.New("nil envelope")
445+
}
443446
msg := &GossipMessage{}
444447
err := proto.Unmarshal(e.Payload, msg)
445448
if err != nil {

protos/gossip/extensions_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ import (
2626
"github.com/stretchr/testify/assert"
2727
)
2828

29+
func TestToGossipMessageNilEnvelope(t *testing.T) {
30+
memReq := &MembershipRequest{}
31+
_, err := memReq.SelfInformation.ToGossipMessage()
32+
assert.EqualError(t, err, "nil envelope")
33+
}
34+
2935
func TestToString(t *testing.T) {
3036
// Ensure we don't print the byte content when we
3137
// log messages.

0 commit comments

Comments
 (0)