diff options
author | jeffro256 <jeffro256@tutanota.com> | 2023-11-17 02:19:45 -0600 |
---|---|---|
committer | jeffro256 <jeffro256@tutanota.com> | 2023-11-18 03:47:55 -0600 |
commit | a11e03afa63c5ed85715d7e67f6c2698f10cd427 (patch) | |
tree | a9b5b8847a2c1fc2fab6bef6dae27208f38917b5 /src/cryptonote_basic/tx_extra.h | |
parent | Merge pull request #9026 (diff) | |
download | monero-a11e03afa63c5ed85715d7e67f6c2698f10cd427.tar.xz |
serialization: fix infinite loops and clean up dispatching
Resolves #8687
Diffstat (limited to '')
-rw-r--r-- | src/cryptonote_basic/tx_extra.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptonote_basic/tx_extra.h b/src/cryptonote_basic/tx_extra.h index af6ee5197..a29f126ee 100644 --- a/src/cryptonote_basic/tx_extra.h +++ b/src/cryptonote_basic/tx_extra.h @@ -52,7 +52,7 @@ namespace cryptonote // load template <template <bool> class Archive> - bool do_serialize(Archive<false>& ar) + bool member_do_serialize(Archive<false>& ar) { // size - 1 - because of variant tag for (size = 1; size <= TX_EXTRA_PADDING_MAX_COUNT; ++size) @@ -73,7 +73,7 @@ namespace cryptonote // store template <template <bool> class Archive> - bool do_serialize(Archive<true>& ar) + bool member_do_serialize(Archive<true>& ar) { if(TX_EXTRA_PADDING_MAX_COUNT < size) return false; @@ -129,7 +129,7 @@ namespace cryptonote // load template <template <bool> class Archive> - bool do_serialize(Archive<false>& ar) + bool member_do_serialize(Archive<false>& ar) { std::string field; if(!::do_serialize(ar, field)) @@ -142,7 +142,7 @@ namespace cryptonote // store template <template <bool> class Archive> - bool do_serialize(Archive<true>& ar) + bool member_do_serialize(Archive<true>& ar) { std::ostringstream oss; binary_archive<true> oar(oss); |