diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-08 12:48:54 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-08 12:48:54 +0200 |
| commit | 30e38cd6a34672224f03aad578a7b571db6ae1ab (patch) | |
| tree | 84b897056a08ad7933fc8821d638f132ca307bdb | |
| parent | Merge pull request #1655 (diff) | |
| parent | bugfix: infinite recursion in get_account_address_from_str_or_url (diff) | |
| download | monero-30e38cd6a34672224f03aad578a7b571db6ae1ab.tar.xz | |
Merge pull request #1683
bab1e9a3 bugfix: infinite recursion in get_account_address_from_str_or_url (kenshi84)
| -rw-r--r-- | src/cryptonote_core/cryptonote_basic_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/cryptonote_basic_impl.cpp b/src/cryptonote_core/cryptonote_basic_impl.cpp index 51c9269a5..338210f01 100644 --- a/src/cryptonote_core/cryptonote_basic_impl.cpp +++ b/src/cryptonote_core/cryptonote_basic_impl.cpp @@ -317,7 +317,7 @@ namespace cryptonote { { bool has_payment_id; crypto::hash8 payment_id; - return get_account_address_from_str_or_url(address, testnet, str_or_url); + return get_account_address_from_str_or_url(address, has_payment_id, payment_id, testnet, str_or_url); } //-------------------------------------------------------------------------------- bool operator ==(const cryptonote::transaction& a, const cryptonote::transaction& b) { |