monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3936

Browse source 
d81e042 tx_pool: initialize bitflags padding since it gets written to storage (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-25 14:53:27 -05:00
commit c3ec5373b3
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/blockchain_db/blockchain_db.h
View file

@ -148,6 +148,7 @@ struct txpool_tx_meta_t
uint8_t relayed; uint8_t relayed;
uint8_t do_not_relay; uint8_t do_not_relay;
uint8_t double_spend_seen: 1; uint8_t double_spend_seen: 1;
uint8_t bf_padding: 7;
uint8_t padding[76]; // till 192 bytes uint8_t padding[76]; // till 192 bytes
}; };

2
src/cryptonote_core/tx_pool.cpp
View file

@ -239,6 +239,7 @@ namespace cryptonote
meta.relayed = relayed; meta.relayed = relayed;
meta.do_not_relay = do_not_relay; meta.do_not_relay = do_not_relay;
meta.double_spend_seen = have_tx_keyimges_as_spent(tx); meta.double_spend_seen = have_tx_keyimges_as_spent(tx);
meta.bf_padding = 0;
memset(meta.padding, 0, sizeof(meta.padding)); memset(meta.padding, 0, sizeof(meta.padding));
try try
{ {
@ -278,6 +279,7 @@ namespace cryptonote
meta.relayed = relayed; meta.relayed = relayed;
meta.do_not_relay = do_not_relay; meta.do_not_relay = do_not_relay;
meta.double_spend_seen = false; meta.double_spend_seen = false;
meta.bf_padding = 0;
memset(meta.padding, 0, sizeof(meta.padding)); memset(meta.padding, 0, sizeof(meta.padding));
try try