Merge pull request #2142

02d66db4 tx_pool: initialize padding in txpool meta structure (moneromooo-monero)
0722aea3 cryptonote_core: initialize checkpoint flag (moneromooo-monero)

2 files changed, 3 insertions, 0 deletions

diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index c601c066c..4cfa52441 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -78,6 +78,7 @@ namespace cryptonote
               m_last_json_checkpoints_update(0),
               m_update_download(0)
   {
+    m_checkpoints_updating.clear();
     set_cryptonote_protocol(pprotocol);
   }
   void core::set_cryptonote_protocol(i_cryptonote_protocol* pprotocol)
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index ffb5b478b..33b1d4101 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -225,6 +225,7 @@ namespace cryptonote
         meta.last_relayed_time = time(NULL);
         meta.relayed = relayed;
         meta.do_not_relay = do_not_relay;
+        memset(meta.padding, 0, sizeof(meta.padding));
         try
         {
           CRITICAL_REGION_LOCAL1(m_blockchain);
@@ -261,6 +262,7 @@ namespace cryptonote
       meta.last_relayed_time = time(NULL);
       meta.relayed = relayed;
       meta.do_not_relay = do_not_relay;
+      memset(meta.padding, 0, sizeof(meta.padding));
 
       try
       {