aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-10-22 22:18:36 +0200
committerRiccardo Spagni <ric@spagni.net>2016-10-22 22:18:36 +0200
commitb3d4505ae12b9759a4de86d99fec9c60d42c0e67 (patch)
tree9d7f43d2e387569900804374f727345caeb70ac6 /src
parentMerge pull request #1225 (diff)
parentwallet_api: do not override invalid payment id (diff)
downloadmonero-b3d4505ae12b9759a4de86d99fec9c60d42c0e67.tar.xz
Merge pull request #1228
2bf65df wallet_api: do not override invalid payment id (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/api/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 94d62666a..470f51281 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -360,7 +360,7 @@ std::string WalletImpl::integratedAddress(const std::string &payment_id) const
{
crypto::hash8 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());
}