diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-16 08:35:42 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-16 08:35:42 -0500 |
| commit | f22dbef28b7420847e648b5120aac733fc501cf1 (patch) | |
| tree | 1a93cdf9aaa7cddfcb5241214db82c6c4a1f92c0 /src/cryptonote_core | |
| parent | ab69d5b3670cc21a10aab9ad16919afdcc80fdba (diff) | |
| parent | 693c1908815d8574a1125288f0400eab5f5085a7 (diff) | |
| download | monzero-core-f22dbef28b7420847e648b5120aac733fc501cf1.tar.gz monzero-core-f22dbef28b7420847e648b5120aac733fc501cf1.tar.xz monzero-core-f22dbef28b7420847e648b5120aac733fc501cf1.zip | |
Merge pull request #1536
693c1908 wallet: add a node RPC cache layer for simple RPC calls (moneromooo-monero)
d86ae2be wallet2: reuse fake outs when adjusting fee on transfer (moneromooo-monero)
64da0983 core: don't try to deserialize an empty extra to remove a field (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/cryptonote_format_utils.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index b5f2b069d..e04409d87 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -371,6 +371,8 @@ namespace cryptonote //--------------------------------------------------------------- bool remove_field_from_tx_extra(std::vector<uint8_t>& tx_extra, const std::type_info &type) { + if (tx_extra.empty()) + return true; std::string extra_str(reinterpret_cast<const char*>(tx_extra.data()), tx_extra.size()); std::istringstream iss(extra_str); binary_archive<false> ar(iss); |