Merge pull request libbitcoin#176 from evoskuil/version3

Patch remap safety issues in slab/record hash tables.
fibercrypto · Jan 21, 2018 · 000ce55 · 000ce55
2 parents ca07e3f + 767f430
commit 000ce55
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/bitcoin/database/impl/record_hash_table.ipp b/include/bitcoin/database/impl/record_hash_table.ipp
@@ -78,8 +78,8 @@ void record_hash_table<KeyType>::update(const KeyType& key,
         // Found.
         if (item.compare(key))
         {
-            const auto data = REMAP_ADDRESS(item.data());
-            auto serial = make_unsafe_serializer(data);
+            const auto memory = item.data();
+            auto serial = make_unsafe_serializer(REMAP_ADDRESS(memory));
             write(serial);
             return;
         }

diff --git a/include/bitcoin/database/impl/slab_hash_table.ipp b/include/bitcoin/database/impl/slab_hash_table.ipp
@@ -80,8 +80,8 @@ file_offset slab_hash_table<KeyType>::update(const KeyType& key,
         // Found.
         if (item.compare(key))
         {
-            const auto data = REMAP_ADDRESS(item.data());
-            auto serial = make_unsafe_serializer(data);
+            const auto memory = item.data();
+            auto serial = make_unsafe_serializer(REMAP_ADDRESS(memory));
             write(serial);
             return item.offset();
         }