Checking for nil genBlk

prysmaticlabs · Feb 4, 2020 · 5f7b5b3 · 5f7b5b3
1 parent 6d5f694
commit 5f7b5b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/beacon-chain/rpc/beacon/attestations.go b/beacon-chain/rpc/beacon/attestations.go
@@ -46,6 +46,9 @@ func (bs *Server) ListAttestations(
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "Could not genesis block: %v", err)
 		}
+		if genBlk == nil {
+			return nil, status.Error(codes.Internal, "Could not find genesis block")
+		}
 		genesisRoot, err := ssz.HashTreeRoot(genBlk.Block)
 		if err != nil {
 			return nil, err

diff --git a/beacon-chain/rpc/beacon/blocks.go b/beacon-chain/rpc/beacon/blocks.go
@@ -139,6 +139,9 @@ func (bs *Server) ListBlocks(
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "Could not retrieve blocks for genesis slot: %v", err)
 		}
+		if genBlk == nil {
+			return nil, status.Error(codes.Internal, "Could not find genesis block")
+		}
 		root, err := ssz.HashTreeRoot(genBlk.Block)
 		if err != nil {
 			return nil, err