monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1228

Browse source 
2bf65df wallet_api: do not override invalid payment id (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-10-22 22:18:36 +02:00
commit b3d4505ae1
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/wallet/api/wallet.cpp
View file

@ -360,7 +360,7 @@ std::string WalletImpl::integratedAddress(const std::string &payment_id) const
{ {
crypto::hash8 pid; crypto::hash8 pid;
if (!tools::wallet2::parse_short_payment_id(payment_id, pid)) { if (!tools::wallet2::parse_short_payment_id(payment_id, pid)) {
pid = crypto::rand<crypto::hash8>(); return "";
} }
return m_wallet->get_account().get_public_integrated_address_str(pid, m_wallet->testnet()); return m_wallet->get_account().get_public_integrated_address_str(pid, m_wallet->testnet());
} }