aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.cpp
diff options
context:
space:
mode:
authormonero-project <sempre.amaro@gmail.com>2014-04-30 12:03:30 -0400
committermonero-project <sempre.amaro@gmail.com>2014-04-30 12:03:30 -0400
commit56bb9591a5e8ebb236a4f326720d9224c892be9a (patch)
treeb039a279ba54c83c8bba5215d7be095e258bd664 /src/wallet/wallet2.cpp
parentTemporarily disable error relating to mangled tx_extra fields (diff)
downloadmonero-56bb9591a5e8ebb236a4f326720d9224c892be9a.tar.xz
return for unhandleable tx_extra
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r--src/wallet/wallet2.cpp4
1 files changed, 4 insertions, 0 deletions
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());