diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-07 23:00:01 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-18 15:34:29 +0200 |
commit | a78996503fc5a3e9f80741d6546fdb7eaf18feef (patch) | |
tree | 9b6706a60a9a8dc6de52052f2830fb33355a3ea2 /src/serialize.h | |
parent | d78e4312b248661c7a5b10ab0f2cd13e81369cd7 (diff) | |
download | bitcoin-a78996503fc5a3e9f80741d6546fdb7eaf18feef.tar.xz |
Add a way to limit deserialized string lengths
and use it for most strings being serialized.
Rebased-From: 216e9a4
Diffstat (limited to 'src/serialize.h')
-rw-r--r-- | src/serialize.h | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/src/serialize.h b/src/serialize.h index 1341746592..a157048d56 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -306,8 +306,9 @@ I ReadVarInt(Stream& is) } } -#define FLATDATA(obj) REF(CFlatData((char*)&(obj), (char*)&(obj) + sizeof(obj))) -#define VARINT(obj) REF(WrapVarInt(REF(obj))) +#define FLATDATA(obj) REF(CFlatData((char*)&(obj), (char*)&(obj) + sizeof(obj))) +#define VARINT(obj) REF(WrapVarInt(REF(obj))) +#define LIMITED_STRING(obj,n) REF(LimitedString< n >(REF(obj))) /** Wrapper for serializing arrays and POD. */ @@ -364,6 +365,40 @@ public: } }; +template<size_t Limit> +class LimitedString +{ +protected: + std::string& string; +public: + LimitedString(std::string& string) : string(string) {} + + template<typename Stream> + void Unserialize(Stream& s, int, int=0) + { + size_t size = ReadCompactSize(s); + if (size > Limit) { + throw std::ios_base::failure("String length limit exceeded"); + } + string.resize(size); + if (size != 0) + s.read((char*)&string[0], size); + } + + template<typename Stream> + void Serialize(Stream& s, int, int=0) const + { + WriteCompactSize(s, string.size()); + if (!string.empty()) + s.write((char*)&string[0], string.size()); + } + + unsigned int GetSerializeSize(int, int=0) const + { + return GetSizeOfCompactSize(string.size()) + string.size(); + } +}; + template<typename I> CVarInt<I> WrapVarInt(I& n) { return CVarInt<I>(n); } |