Merge pull request #1683

bab1e9a3  bugfix: infinite recursion in get_account_address_from_str_or_url (kenshi84)
This commit is contained in:
Riccardo Spagni 2017-02-08 12:48:54 +02:00
commit 30e38cd6a3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -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) {