maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Split up and sanitize CAccountingEntry serialization

Browse source
This commit is contained in:
Pieter Wuille 2018-03-09 17:25:28 -08:00
parent 029ecac1bc
commit 42343c748c
1 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/wallet/wallet.h
View file

@ -602,48 +602,49 @@ public:
nEntryNo = 0; nEntryNo = 0;
} }
ADD_SERIALIZE_METHODS; template <typename Stream>
void Serialize(Stream& s) const {
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action) {
int nVersion = s.GetVersion(); int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH)) if (!(s.GetType() & SER_GETHASH)) {
READWRITE(nVersion); s << nVersion;
}
//! Note: strAccount is serialized as part of the key, not here. //! Note: strAccount is serialized as part of the key, not here.
READWRITE(nCreditDebit); s << nCreditDebit << nTime << strOtherAccount;
READWRITE(nTime);
READWRITE(LIMITED_STRING(strOtherAccount, 65536));
if (!ser_action.ForRead()) mapValue_t mapValueCopy = mapValue;
{ WriteOrderPos(nOrderPos, mapValueCopy);
WriteOrderPos(nOrderPos, mapValue);
if (!(mapValue.empty() && _ssExtra.empty())) std::string strCommentCopy = strComment;
{ if (!mapValueCopy.empty() || !_ssExtra.empty()) {
CDataStream ss(s.GetType(), s.GetVersion()); CDataStream ss(s.GetType(), s.GetVersion());
ss.insert(ss.begin(), '\0'); ss.insert(ss.begin(), '\0');
ss << mapValue; ss << mapValueCopy;
ss.insert(ss.end(), _ssExtra.begin(), _ssExtra.end()); ss.insert(ss.end(), _ssExtra.begin(), _ssExtra.end());
strComment.append(ss.str()); strCommentCopy.append(ss.str());
} }
s << strCommentCopy;
} }
READWRITE(LIMITED_STRING(strComment, 65536)); template <typename Stream>
void Unserialize(Stream& s) {
int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH)) {
s >> nVersion;
}
//! Note: strAccount is serialized as part of the key, not here.
s >> nCreditDebit >> nTime >> LIMITED_STRING(strOtherAccount, 65536) >> LIMITED_STRING(strComment, 65536);
size_t nSepPos = strComment.find("\0", 0, 1); size_t nSepPos = strComment.find("\0", 0, 1);
if (ser_action.ForRead())
{
mapValue.clear(); mapValue.clear();
if (std::string::npos != nSepPos) if (std::string::npos != nSepPos) {
{
CDataStream ss(std::vector<char>(strComment.begin() + nSepPos + 1, strComment.end()), s.GetType(), s.GetVersion()); CDataStream ss(std::vector<char>(strComment.begin() + nSepPos + 1, strComment.end()), s.GetType(), s.GetVersion());
ss >> mapValue; ss >> mapValue;
_ssExtra = std::vector<char>(ss.begin(), ss.end()); _ssExtra = std::vector<char>(ss.begin(), ss.end());
} }
ReadOrderPos(nOrderPos, mapValue); ReadOrderPos(nOrderPos, mapValue);
} if (std::string::npos != nSepPos) {
if (std::string::npos != nSepPos)
strComment.erase(nSepPos); strComment.erase(nSepPos);
}
mapValue.erase("n"); mapValue.erase("n");
} }