nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wipeable_string: move a wipe from reserve to grow

Browse Source 
That way, all implicit wipes ends up in grow, which is more robust
This commit is contained in:
moneromooo-monero 2017-12-19 14:03:35 +00:00
parent 5f801b6adf
commit 6c94516fb4
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/epee/src/wipeable_string.cpp
View File

@ -89,6 +89,8 @@ void wipeable_string::grow(size_t sz, size_t reserved)
reserved = sz; reserved = sz;
if (reserved <= buffer.capacity()) if (reserved <= buffer.capacity())
{ {
if (sz < buffer.size())
wipefunc(buffer.data() + sz, buffer.size() - sz);
buffer.resize(sz); buffer.resize(sz);
return; return;
} }
@ -115,9 +117,6 @@ void wipeable_string::pop_back()
void wipeable_string::resize(size_t sz) void wipeable_string::resize(size_t sz)
{ {
CHECK_AND_ASSERT_THROW_MES(wipefunc, "wipefunc is not set");
if (sz < buffer.size())
wipefunc(buffer.data() + sz, buffer.size() - sz);
grow(sz); grow(sz);
} }