Fix issue in validated_block_exists_impl when id is not present (…

…assert not always true)
AntelopeIO · Sep 17, 2024 · 3a133d2 · heifner · Sep 17, 2024 · greg7mdp
1 parent 54f626f
commit 3a133d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -1139,7 +1139,6 @@ struct controller_impl {
 
    // returns true if block `id`, or one of its ancestors not older than claimed_id, is found in fork_db
    // and `is_valid()`
-   // precondition: `id` is already in fork_db, so is a descendent of `root`
    // ------------------------------------------------------------------------------------------------------
    bool fork_db_validated_block_exists( const block_id_type& id, const block_id_type& claimed_id ) const {
       return fork_db.apply<bool>([&](const auto& forkdb) {

diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
@@ -610,19 +610,19 @@ namespace eosio::chain {
 
    // returns true if block `id`, or one of its ancestors not older than claimed_id, is found in fork_db
    // and `is_valid()`
-   // precondition: `id` is already in fork_db, so is a descendent of `root`
    // ------------------------------------------------------------------------------------------------------
    template<class BSP>
    bool fork_database_impl<BSP>::validated_block_exists_impl(const block_id_type& id, const block_id_type& claimed_id) const {
-      assert(root && (root->id() == id || index.find(id) != index.end()));
+      bool id_present = false;
 
       for (auto i = index.find(id); i != index.end(); i = index.find((*i)->previous())) {
+         id_present = true;
          if ((*i)->is_valid())
             return true;
          if ((*i)->id() == claimed_id)
             return false;
       }
-      return true;
+      return id_present;
    }
 
 // ------------------ fork_database -------------------------