diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-06-25 14:53:27 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-06-25 14:53:27 -0500 |
| commit | c3ec5373b3c61c4bf0df126473cbcec528c6d393 (patch) | |
| tree | 0dc7b85cf4ebfb9e72de101beb02b9556c2477ef | |
| parent | Merge pull request #3921 (diff) | |
| parent | tx_pool: initialize bitflags padding since it gets written to storage (diff) | |
| download | monero-c3ec5373b3c61c4bf0df126473cbcec528c6d393.tar.xz | |
Merge pull request #3936
d81e042 tx_pool: initialize bitflags padding since it gets written to storage (moneromooo-monero)
| -rw-r--r-- | src/blockchain_db/blockchain_db.h | 1 | ||||
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/blockchain_db/blockchain_db.h b/src/blockchain_db/blockchain_db.h index 19ba32340..564016fc9 100644 --- a/src/blockchain_db/blockchain_db.h +++ b/src/blockchain_db/blockchain_db.h @@ -148,6 +148,7 @@ struct txpool_tx_meta_t uint8_t relayed; uint8_t do_not_relay; uint8_t double_spend_seen: 1; + uint8_t bf_padding: 7; uint8_t padding[76]; // till 192 bytes }; diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 164530b3e..9df3b458b 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -239,6 +239,7 @@ namespace cryptonote meta.relayed = relayed; meta.do_not_relay = do_not_relay; meta.double_spend_seen = have_tx_keyimges_as_spent(tx); + meta.bf_padding = 0; memset(meta.padding, 0, sizeof(meta.padding)); try { @@ -278,6 +279,7 @@ namespace cryptonote meta.relayed = relayed; meta.do_not_relay = do_not_relay; meta.double_spend_seen = false; + meta.bf_padding = 0; memset(meta.padding, 0, sizeof(meta.padding)); try |