Merge pull request #456 from evoskuil/master

Fix block object leak in the case of default allocation.
libbitcoin · Jan 31, 2025 · 704358c · 704358c
2 parents 6a3fda0 + 52b0b8a
commit 704358c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -51,8 +51,7 @@
       <!-- WIN32_LEAN_AND_MEAN avoids inclusion of certain headers, winsock.h conflicts with boost and protocol use of winsock2.h. -->
       <PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile>
+      <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Debug')) != -1">_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- Enable use of CPU intrinsics. -->
       <PreprocessorDefinitions Condition="'$(Option-avx512)' == 'true'">WITH_AVX512;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-avx2)'   == 'true'">WITH_AVX2;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/include/bitcoin/network/net/distributor.hpp b/include/bitcoin/network/net/distributor.hpp
@@ -198,7 +198,8 @@ class BCT_API distributor
     memory& memory_;
 };
 
-// block message uses specialized deserializer for memory management.
+// Block message uses specialized deserializer for memory management.
+// Other message types use default (unspecified) memory allocation.
 template <>
 code distributor::do_notify<messages::block>(
     distributor::block_subscriber& subscriber, uint32_t version,

diff --git a/src/messages/block.cpp b/src/messages/block.cpp
@@ -45,8 +45,10 @@ const uint32_t block::version_maximum = level::maximum_protocol;
 typename block::cptr block::deserialize(uint32_t version,
     const data_chunk& data, bool witness) NOEXCEPT
 {
-    static default_memory memory{};
-    return deserialize(*memory.get_arena(), version, data, witness);
+    // default_arena::get() returns pointer to static instance of
+    // system::default_arena, which is not detachable and calls into
+    // std::malloc() and std::free() for each individual allocation.
+    return deserialize(*default_arena::get(), version, data, witness);
 }
 
 // static
@@ -58,8 +60,6 @@ typename block::cptr block::deserialize(arena& arena, uint32_t version,
 
     // Set starting address of block allocation (nullptr if not detachable).
     const auto memory = pointer_cast<uint8_t>(arena.start(data.size()));
-    if (is_null(memory))
-        return nullptr;
 
     istream source{ data };
     byte_reader reader{ source, &arena };
@@ -85,10 +85,10 @@ typename block::cptr block::deserialize(arena& arena, uint32_t version,
 
     // All block and contained object destructors should be optimized out.
     return to_shared<messages::block>(std::shared_ptr<chain::block>(block,
-        [&arena, memory](auto) NOEXCEPT
+        [&arena, memory](auto ptr) NOEXCEPT
         {
             // Destruct and deallocate objects (nop deallocate if detachable).
-            byte_allocator::deleter<chain::block>(&arena);
+            byte_allocator::deleter<chain::block>(&arena)(ptr);
 
             // Deallocate detached memory (nop if not detachable).
             arena.release(memory);

diff --git a/src/net/proxy.cpp b/src/net/proxy.cpp
@@ -19,7 +19,6 @@
 #include <bitcoin/network/net/proxy.hpp>
 
 #include <algorithm>
-#include <functional>
 #include <utility>
 #include <bitcoin/system.hpp>
 #include <bitcoin/network/async/async.hpp>

diff --git a/src/sessions/session_outbound.cpp b/src/sessions/session_outbound.cpp
@@ -19,7 +19,6 @@
 #include <bitcoin/network/sessions/session_outbound.hpp>
 
 #include <algorithm>
-#include <functional>
 #include <utility>
 #include <bitcoin/system.hpp>
 #include <bitcoin/network/async/async.hpp>