From 56bb9591a5e8ebb236a4f326720d9224c892be9a Mon Sep 17 00:00:00 2001 From: monero-project Date: Wed, 30 Apr 2014 12:03:30 -0400 Subject: [PATCH] return for unhandleable tx_extra --- src/wallet/wallet2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 47bf80e36..ca16025bf 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -41,7 +41,11 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ // Temporarily disabled due to messed up tx_extra from someone // screwing around with MMing. 2014-04-30 + // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); + + // We don't know how to handle this weird tx, so return + if (!r) return; r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs); THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys());