Add block msg unmarshal error check

diff --git a/netsync/handle.go b/netsync/handle.go
index 1747a0e..eea401b 100644 (file)
--- a/netsync/handle.go
+++ b/netsync/handle.go
@@ -155,7 +155,11 @@ func (sm *SyncManager) Switch() *p2p.Switch {
 }
 
 func (sm *SyncManager) handleBlockMsg(peer *peer, msg *BlockMessage) {
-       sm.blockKeeper.processBlock(peer.ID(), msg.GetBlock())
+       block, err := msg.GetBlock()
+       if err != nil {
+               return
+       }
+       sm.blockKeeper.processBlock(peer.ID(), block)
 }
 
 func (sm *SyncManager) handleBlocksMsg(peer *peer, msg *BlocksMessage) {

diff --git a/netsync/message.go b/netsync/message.go
index 67fe2ed..c6e03f9 100644 (file)
--- a/netsync/message.go
+++ b/netsync/message.go
@@ -105,13 +105,15 @@ func NewBlockMessage(block *types.Block) (*BlockMessage, error) {
 }
 
 //GetBlock get block from msg
-func (m *BlockMessage) GetBlock() *types.Block {
+func (m *BlockMessage) GetBlock() (*types.Block, error) {
        block := &types.Block{
                BlockHeader:  types.BlockHeader{},
                Transactions: []*types.Tx{},
        }
-       block.UnmarshalText(m.RawBlock)
-       return block
+       if err := block.UnmarshalText(m.RawBlock); err != nil {
+               return nil, err
+       }
+       return block, nil
 }
 
 //String convert msg to string