Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5503

Browse Source 
ccc1e311 wallet_rpc_server: reject standalone short payment id in address book (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-05-07 17:34:16 +02:00
commit c20221f290
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet_rpc_server.cpp
View File

@ -2814,20 +2814,20 @@ namespace tools
} }
crypto::hash long_payment_id; crypto::hash long_payment_id;
crypto::hash8 short_payment_id;
if (!wallet2::parse_long_payment_id(req.payment_id, payment_id)) if (!wallet2::parse_long_payment_id(req.payment_id, payment_id))
{ {
if (!wallet2::parse_short_payment_id(req.payment_id, info.payment_id)) if (!wallet2::parse_short_payment_id(req.payment_id, info.payment_id))
{ {
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID; er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
er.message = "Payment id has invalid format: \"" + req.payment_id + "\", expected 16 or 64 character string"; er.message = "Payment id has invalid format: \"" + req.payment_id + "\", expected 64 character string";
return false; return false;
} }
else else
{ {
memcpy(payment_id.data, info.payment_id.data, 8); er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
memset(payment_id.data + 8, 0, 24); er.message = "Payment id has invalid format: standalone short payment IDs are forbidden, they must be part of an integrated address";
return false;
} }
} }
} }