Merge pull request 1648

8c8482a wallet_rpc_server: fix short payment id validation in transfer (moneromooo-monero)
This commit is contained in:
luigi1111 2017-01-30 17:03:07 -06:00
commit ef987e5e49
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -369,7 +369,7 @@ namespace tools
cryptonote::set_payment_id_to_tx_extra_nonce(extra_nonce, long_payment_id); cryptonote::set_payment_id_to_tx_extra_nonce(extra_nonce, long_payment_id);
} }
/* or short payment ID */ /* or short payment ID */
else if (!wallet2::parse_short_payment_id(payment_id_str, short_payment_id)) { else if (wallet2::parse_short_payment_id(payment_id_str, short_payment_id)) {
cryptonote::set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, short_payment_id); cryptonote::set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, short_payment_id);
} }
else { else {