rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2142

Browse Source 
02d66db4 tx_pool: initialize padding in txpool meta structure (moneromooo-monero)
0722aea3 cryptonote_core: initialize checkpoint flag (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-07-19 11:49:42 +02:00
commit 42fc89b672
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
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/cryptonote_core/cryptonote_core.cpp
View File

@ -78,6 +78,7 @@ namespace cryptonote
m_last_json_checkpoints_update(0), m_last_json_checkpoints_update(0),
m_update_download(0) m_update_download(0)
{ {
m_checkpoints_updating.clear();
set_cryptonote_protocol(pprotocol); set_cryptonote_protocol(pprotocol);
} }
void core::set_cryptonote_protocol(i_cryptonote_protocol* pprotocol) void core::set_cryptonote_protocol(i_cryptonote_protocol* pprotocol)

2
src/cryptonote_core/tx_pool.cpp
View File

@ -225,6 +225,7 @@ namespace cryptonote
meta.last_relayed_time = time(NULL); meta.last_relayed_time = time(NULL);
meta.relayed = relayed; meta.relayed = relayed;
meta.do_not_relay = do_not_relay; meta.do_not_relay = do_not_relay;
memset(meta.padding, 0, sizeof(meta.padding));
try try
{ {
CRITICAL_REGION_LOCAL1(m_blockchain); CRITICAL_REGION_LOCAL1(m_blockchain);
@ -261,6 +262,7 @@ namespace cryptonote
meta.last_relayed_time = time(NULL); meta.last_relayed_time = time(NULL);
meta.relayed = relayed; meta.relayed = relayed;
meta.do_not_relay = do_not_relay; meta.do_not_relay = do_not_relay;
memset(meta.padding, 0, sizeof(meta.padding));
try try
{ {