aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-08-18 09:47:06 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-08-18 09:55:24 +0200
commit21e7a5690f77eb2ac04befe07008367cdf142905 (patch)
tree0d57b9b95c7630319ce4d8700e4b2e424f4a81bb /src/wallet.h
parente2e73e5d8f5d0622711f5367c4f06f5dddc12523 (diff)
parent216e9a4456207f5ae9cd85926521851e11a26d92 (diff)
downloadbitcoin-21e7a5690f77eb2ac04befe07008367cdf142905.tar.xz
Merge pull request #4655
216e9a4 Add a way to limit deserialized string lengths (Pieter Wuille)
Diffstat (limited to 'src/wallet.h')
-rw-r--r--src/wallet.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet.h b/src/wallet.h
index 73fcfa24e0..864a635ec7 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -858,7 +858,7 @@ public:
READWRITE(vchPrivKey);
READWRITE(nTimeCreated);
READWRITE(nTimeExpires);
- READWRITE(strComment);
+ READWRITE(LIMITED_STRING(strComment, 65536));
)
};
@@ -933,7 +933,7 @@ public:
// Note: strAccount is serialized as part of the key, not here.
READWRITE(nCreditDebit);
READWRITE(nTime);
- READWRITE(strOtherAccount);
+ READWRITE(LIMITED_STRING(strOtherAccount, 65536));
if (!fRead)
{
@@ -949,7 +949,7 @@ public:
}
}
- READWRITE(strComment);
+ READWRITE(LIMITED_STRING(strComment, 65536));
size_t nSepPos = strComment.find("\0", 0, 1);
if (fRead)