app shutdown when corrupt blocks during reconstruction

libraries/chain/block_log.cpp

@@ -358,7 +358,12 @@ namespace eosio { namespace chain {
       }
 
       while( pos < end_pos ) {
-         fc::raw::unpack(my->block_stream, tmp);
+          try {
+              fc::raw::unpack(my->block_stream, tmp);
+          } catch( const fc::assert_exception& ex) {
+              elog("Failed to unpack block log.  Block log is corrupt: ${ex}", ("ex", ex.what()));
+              throw ex;
+          }
          my->block_stream.read((char*)&pos, sizeof(pos));
          if(tmp.block_num() % 1000 == 0)
             ilog( "Block log index reconstructed for block ${n}", ("n", tmp.block_num()));

plugins/chain_plugin/chain_plugin.cpp

@@ -815,7 +815,9 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
       auto itr = ubi.rbegin();
       if( itr != ubi.rend() && itr->blocknum <= truncate_at_block )
          return false; // Because we are not going to be truncating the reversible database at all.
-   } catch( const std::runtime_error& ) {
+   } catch( const std::runtime_error& e) {
+       elog("${ex}", ("ex", e.what()));
+       app().quit();
    } catch( ... ) {
       throw;
    }