Merge pull request #2966 from EOSIO/gh#2963-core

Add null check with exception expected by net_plugin
EOSIO · May 11, 2018 · 6957747 · 6957747
2 parents bde431b + 18b3500
commit 6957747
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -1189,7 +1189,12 @@ block_id_type controller::get_block_id_for_num( uint32_t block_num )const { try
       return blk_state->id;
    }
 
-   return my->blog.read_block_by_num(block_num)->id();
+   auto signed_blk = my->blog.read_block_by_num(block_num);
+
+   EOS_ASSERT( BOOST_LIKELY( signed_blk != nullptr ), unknown_block_exception,
+               "Could not find block: ${block}", ("block", block_num) );
+
+   return signed_blk->id();
 } FC_CAPTURE_AND_RETHROW( (block_num) ) }
 
 void controller::pop_block() {