From 5f801b6adfeb8d0fa8afc1183ff3ff5318624221 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 19 Dec 2017 14:00:41 +0000 Subject: wipeable_string: ignore reserve size less than actual size This was asserting, but stoffu pointed out the std::string standard considers this ok and ignorable --- contrib/epee/src/wipeable_string.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'contrib/epee') diff --git a/contrib/epee/src/wipeable_string.cpp b/contrib/epee/src/wipeable_string.cpp index c8fed7bb3..2ec1e5469 100644 --- a/contrib/epee/src/wipeable_string.cpp +++ b/contrib/epee/src/wipeable_string.cpp @@ -85,9 +85,8 @@ void wipeable_string::wipe() void wipeable_string::grow(size_t sz, size_t reserved) { CHECK_AND_ASSERT_THROW_MES(wipefunc, "wipefunc is not set"); - if (reserved == 0) + if (reserved < sz) reserved = sz; - CHECK_AND_ASSERT_THROW_MES(reserved >= sz, "reserved < sz"); if (reserved <= buffer.capacity()) { buffer.resize(sz); -- cgit v1.2.3