monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 13:09:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1683

Browse source 
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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cryptonote_core/cryptonote_basic_impl.cpp
View file

@ -317,7 +317,7 @@ namespace cryptonote {
{ {
bool has_payment_id; bool has_payment_id;
crypto::hash8 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) { bool operator ==(const cryptonote::transaction& a, const cryptonote::transaction& b) {