Merge pull request #1683

bab1e9a3 bugfix: infinite recursion in get_account_address_from_str_or_url (kenshi84)
8 years ago · 30e38cd6a3
parent 3473af00ad bab1e9a397
commit 30e38cd6a3
1 changed files with 1 additions and 1 deletions
--- 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) {