Merge pull request #4885

b5573fc2 wallet2: resume processing when tx extra is partially broken (stoffu)
2018-12-04 17:31:27 +02:00 · 2018-12-04 17:31:27 +02:00 · 6e74aa9a6c
parent 1bebe99496 b5573fc231
commit 6e74aa9a6c
1 changed files with 2 additions and 2 deletions
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@ -1382,8 +1382,8 @@ void wallet2::cache_tx_data(const cryptonote::transaction& tx, const crypto::has
  {
    // Extra may only be partially parsed, it's OK if tx_extra_fields contains public key
    LOG_PRINT_L0("Transaction extra has unsupported format: " << txid);
-    tx_cache_data.tx_extra_fields.clear();
-    return;
+    if (tx_cache_data.tx_extra_fields.empty())
+      return;
  }

  // Don't try to extract tx public key if tx has no ouputs