ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-04 20:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ASAN heap-buffer-overflow issue in DBHelpers (#2310)

Browse Source
This commit is contained in:
Alex Kremer
2025-07-09 21:17:25 +01:00
committed by GitHub
parent bfe5b52a64
commit 44d39f335e
4 changed files with 7 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/WebHandlers.cpp
View File

@@ -97,7 +97,7 @@ HealthCheckHandler::operator()(
boost::asio::yield_context boost::asio::yield_context
) )
{ {
static auto constexpr kHEALTH_CHECK_HTML = R"html( static constexpr auto kHEALTH_CHECK_HTML = R"html(
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head><title>Test page for Clio</title></head> <head><title>Test page for Clio</title></head>

54
src/data/DBHelpers.hpp
View File

@@ -198,39 +198,6 @@ struct MPTHolderData {
ripple::AccountID holder; ripple::AccountID holder;
}; };
/**
* @brief Check whether the supplied object is an offer.
*
* @param object The object to check
* @return true if the object is an offer; false otherwise
*/
template <typename T>
inline bool
isOffer(T const& object)
{
static constexpr short kOFFER_OFFSET = 0x006f;
static constexpr short kSHIFT = 8;
short offerBytes = (object[1] << kSHIFT) | object[2];
return offerBytes == kOFFER_OFFSET;
}
/**
* @brief Check whether the supplied hex represents an offer object.
*
* @param object The object to check
* @return true if the object is an offer; false otherwise
*/
template <typename T>
inline bool
isOfferHex(T const& object)
{
auto blob = ripple::strUnHex(4, object.begin(), object.begin() + 4);
if (blob)
return isOffer(*blob);
return false;
}
/** /**
* @brief Check whether the supplied object is a dir node. * @brief Check whether the supplied object is a dir node.
* *
@@ -241,6 +208,10 @@ template <typename T>
inline bool inline bool
isDirNode(T const& object) isDirNode(T const& object)
{ {
static constexpr auto kMIN_SIZE_REQUIRED = 3;
if (std::size(object) < kMIN_SIZE_REQUIRED)
return false;
static constexpr short kDIR_NODE_SPACE_KEY = 0x0064; static constexpr short kDIR_NODE_SPACE_KEY = 0x0064;
short const spaceKey = (object.data()[1] << 8) | object.data()[2]; short const spaceKey = (object.data()[1] << 8) | object.data()[2];
return spaceKey == kDIR_NODE_SPACE_KEY; return spaceKey == kDIR_NODE_SPACE_KEY;
@@ -264,23 +235,6 @@ isBookDir(T const& key, R const& object)
return !sle[~ripple::sfOwner].has_value(); return !sle[~ripple::sfOwner].has_value();
} }
/**
* @brief Get the book out of an offer object.
*
* @param offer The offer to get the book for
* @return Book as ripple::uint256
*/
template <typename T>
inline ripple::uint256
getBook(T const& offer)
{
ripple::SerialIter it{offer.data(), offer.size()};
ripple::SLE const sle{it, {}};
ripple::uint256 book = sle.getFieldH256(ripple::sfBookDirectory);
return book;
}
/** /**
* @brief Get the book base. * @brief Get the book base.
* *

2
src/web/impl/HttpBase.hpp
View File

@@ -62,7 +62,7 @@
namespace web::impl { namespace web::impl {
static auto constexpr kHEALTH_CHECK_HTML = R"html( static constexpr auto kHEALTH_CHECK_HTML = R"html(
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head><title>Test page for Clio</title></head> <head><title>Test page for Clio</title></head>

2
tests/unit/util/BlockingCacheTests.cpp
View File

@@ -222,7 +222,7 @@ TEST_F(BlockingCacheTest, InvalidateWhenStateIsHasValue)
EXPECT_EQ(cache->state(), Cache::State::NoValue); EXPECT_EQ(cache->state(), Cache::State::NoValue);
} }
TEST_F(BlockingCacheTest, UpdateFromTwoCoroutinesHappensOnlyOnes) TEST_F(BlockingCacheTest, UpdateFromTwoCoroutinesHappensOnlyOnce)
{ {
auto waitingCoroutine = [&](boost::asio::yield_context yield) { auto waitingCoroutine = [&](boost::asio::yield_context yield) {
auto result = cache->update(yield, mockUpdater.AsStdFunction(), mockVerifier.AsStdFunction()); auto result = cache->update(yield, mockUpdater.AsStdFunction(), mockVerifier.AsStdFunction());