From c4da9c36aefb99d793e38eab9e098940cb1aa919 Mon Sep 17 00:00:00 2001
From: Benjamin Wenger <ben@elixxir.ioo>
Date: Thu, 6 Jan 2022 17:18:44 -0800
Subject: [PATCH] fixed the message being passed to garbled being nil
---
network/message/handler.go | 4 ++--
storage/utility/meteredCmixMessageBuffer.go | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/network/message/handler.go b/network/message/handler.go
index a72dece83..bc47864d7 100644
--- a/network/message/handler.go
+++ b/network/message/handler.go
@@ -72,9 +72,9 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
identity.Source, expectedFP, ecrMsg.GetIdentityFP())
}
im := fmt.Sprintf("Garbled/RAW Message: keyFP: %v, round: %d"+
- "msgDigest: %s, not determined to be for client", msg.GetKeyFP(), bundle.Round, msg.Digest())
+ "msgDigest: %s, not determined to be for client", ecrMsg.GetKeyFP(), bundle.Round, ecrMsg.Digest())
m.Internal.Events.Report(1, "MessageReception", "Garbled", im)
- m.Session.GetGarbledMessages().Add(msg)
+ m.Session.GetGarbledMessages().Add(ecrMsg)
return
}
diff --git a/storage/utility/meteredCmixMessageBuffer.go b/storage/utility/meteredCmixMessageBuffer.go
index ed1920ff4..9060dbb7e 100644
--- a/storage/utility/meteredCmixMessageBuffer.go
+++ b/storage/utility/meteredCmixMessageBuffer.go
@@ -114,6 +114,10 @@ func LoadMeteredCmixMessageBuffer(kv *versioned.KV, key string) (*MeteredCmixMes
}
func (mcmb *MeteredCmixMessageBuffer) Add(m format.Message) {
+ if m.GetPrimeByteLen()==0{
+ jww.FATAL.Panicf("Cannot handle a metered " +
+ "cmix message with a length of 0")
+ }
msg := meteredCmixMessage{
M: m.Marshal(),
Count: 0,
--
GitLab