Compare commits

..

2 Commits

Author SHA1 Message Date
JCW
28f3d16ff1 Fix formatting
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-10-23 11:06:58 +01:00
JCW
5a8b23519c Fix the crashing bug 2025-10-06 10:02:21 +01:00
2 changed files with 15 additions and 3 deletions

View File

@@ -36,7 +36,7 @@ namespace BuildInfo {
// and follow the format described at http://semver.org/
//------------------------------------------------------------------------------
// clang-format off
char const* const versionString = "3.0.0-b1"
char const* const versionString = "2.6.1"
// clang-format on
#if defined(DEBUG) || defined(SANITIZER)

View File

@@ -29,6 +29,8 @@
#include <xrpl/beast/container/aged_unordered_map.h>
#include <xrpl/protocol/PublicKey.h>
#include "xrpld/shamap/SHAMapMissingNode.h"
#include <mutex>
#include <optional>
#include <type_traits>
@@ -386,8 +388,18 @@ private:
{
for (auto it = acquiring_.begin(); it != acquiring_.end();)
{
if (std::optional<Ledger> ledger =
adaptor_.acquire(it->first.second))
std::optional<Ledger> ledger;
try
{
// Skip if we haven't finished acquiring this ledger,
// or the ledger we acquired isn't complete, which can happen
// because we're still trying to catch up.
ledger = adaptor_.acquire(it->first.second);
}
catch (SHAMapMissingNode const&)
{
}
if (ledger)
{
for (NodeID const& nodeID : it->second)
updateTrie(lock, nodeID, *ledger);