aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-12-04 17:31:27 +0200
committerRiccardo Spagni <ric@spagni.net>2018-12-04 17:31:27 +0200
commit6e74aa9a6cbc2ea42f6d5c0641b68a9962decb96 (patch)
tree832eb1275e6f166a23a88d1dfec4729f7ef56169
parentMerge pull request #4884 (diff)
parentwallet2: resume processing when tx extra is partially broken (diff)
downloadmonero-6e74aa9a6cbc2ea42f6d5c0641b68a9962decb96.tar.xz
Merge pull request #4885
b5573fc2 wallet2: resume processing when tx extra is partially broken (stoffu)
-rw-r--r--src/wallet/wallet2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 627eafe8c..202a8ef75 100644
--- 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