aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authorkenshi84 <kenshi84@protonmail.ch>2017-02-05 23:20:16 +0900
committerkenshi84 <kenshi84@protonmail.ch>2017-02-05 23:20:16 +0900
commitbab1e9a3970bb834d847f0faf481b0892db1ee15 (patch)
tree84b897056a08ad7933fc8821d638f132ca307bdb /src/cryptonote_core
parentMerge pull request #1655 (diff)
downloadmonero-bab1e9a3970bb834d847f0faf481b0892db1ee15.tar.xz
bugfix: infinite recursion in get_account_address_from_str_or_url
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/cryptonote_basic_impl.cpp2
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) {