fix array out of index range (#231)

diff --git a/protocol/block.go b/protocol/block.go
index a1d5830..0eafe27 100644 (file)
--- a/protocol/block.go
+++ b/protocol/block.go
@@ -205,7 +205,7 @@ func (c *Chain) reorganizeChain(blockHeader *types.BlockHeader) error {
                log.WithFields(log.Fields{"module": logModule, "height": blockHeader.Height, "hash": blockHash.String()}).Debug("attach from mainchain")
        }
 
-       if detachBlockHeaders[len(detachBlockHeaders)-1].Height <= c.bestIrrBlockHeader.Height && irrBlockHeader.Height <= c.bestIrrBlockHeader.Height {
+       if len(detachBlockHeaders) > 0 && detachBlockHeaders[len(detachBlockHeaders)-1].Height <= c.bestIrrBlockHeader.Height && irrBlockHeader.Height <= c.bestIrrBlockHeader.Height {
                return errors.New("rollback block below the height of irreversible block")
        }
        voteResults = append(voteResults, voteResult.Fork())

diff --git a/protocol/block_test.go b/protocol/block_test.go
index cde4188..6fbb6df 100644 (file)
--- a/protocol/block_test.go
+++ b/protocol/block_test.go
@@ -71,12 +71,26 @@ func TestCalcReorganizeChain(t *testing.T) {
                c.store.SaveBlockHeader(newChainBlockHeader)
        }
 
+       // normal
        getAttachBlockHeaders, getDetachBlockHeaders, _ := c.calcReorganizeChain(newChainBlockHeader, mainChainBlockHeader)
        if !testutil.DeepEqual(wantAttachBlockHeaders, getAttachBlockHeaders) {
-               t.Errorf("attach headers want %v but get %v", wantAttachBlockHeaders, getAttachBlockHeaders)
+               t.Errorf("normal test: attach headers want %v but get %v", wantAttachBlockHeaders, getAttachBlockHeaders)
        }
 
        if !testutil.DeepEqual(wantDetachBlockHeaders, getDetachBlockHeaders) {
-               t.Errorf("detach headers want %v but get %v", wantDetachBlockHeaders, getDetachBlockHeaders)
+               t.Errorf("normal test: detach headers want %v but get %v", wantDetachBlockHeaders, getDetachBlockHeaders)
+       }
+
+       // detachBlockHeaders is empty
+       forkChainBlockHeader := wantAttachBlockHeaders[7]
+       wantAttachBlockHeaders = wantAttachBlockHeaders[8:]
+       wantDetachBlockHeaders = []*types.BlockHeader{}
+       getAttachBlockHeaders, getDetachBlockHeaders, _ = c.calcReorganizeChain(newChainBlockHeader, forkChainBlockHeader)
+       if !testutil.DeepEqual(wantAttachBlockHeaders, getAttachBlockHeaders) {
+               t.Errorf("detachBlockHeaders is empty test: attach headers want %v but get %v", wantAttachBlockHeaders, getAttachBlockHeaders)
+       }
+
+       if !testutil.DeepEqual(wantDetachBlockHeaders, getDetachBlockHeaders) {
+               t.Errorf("detachBlockHeaders is empty test: detach headers want %v but get %v", wantDetachBlockHeaders, getDetachBlockHeaders)
        }
 }