Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3289 

4789f859 wipeable_string: don't try to wipe an empty buffer (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-02-20 17:48:16 +02:00
parent ea9ddcac7f 4789f8598f
commit 854a87d633
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,8 @@ wipeable_string::~wipeable_string()
void wipeable_string::wipe() void wipeable_string::wipe()
{ {
memwipe(buffer.data(), buffer.size() * sizeof(char)); if (!buffer.empty())
memwipe(buffer.data(), buffer.size() * sizeof(char));
} }
void wipeable_string::grow(size_t sz, size_t reserved) void wipeable_string::grow(size_t sz, size_t reserved)
@ -93,11 +94,13 @@ void wipeable_string::grow(size_t sz, size_t reserved)
size_t old_sz = buffer.size(); size_t old_sz = buffer.size();
std::unique_ptr<char[]> tmp{new char[old_sz]}; std::unique_ptr<char[]> tmp{new char[old_sz]};
memcpy(tmp.get(), buffer.data(), old_sz * sizeof(char)); memcpy(tmp.get(), buffer.data(), old_sz * sizeof(char));
memwipe(buffer.data(), old_sz * sizeof(char)); if (old_sz > 0)
memwipe(buffer.data(), old_sz * sizeof(char));
buffer.reserve(reserved); buffer.reserve(reserved);
buffer.resize(sz); buffer.resize(sz);
memcpy(buffer.data(), tmp.get(), old_sz * sizeof(char)); memcpy(buffer.data(), tmp.get(), old_sz * sizeof(char));
memwipe(tmp.get(), old_sz * sizeof(char)); if (old_sz > 0)
memwipe(tmp.get(), old_sz * sizeof(char));
} }
void wipeable_string::push_back(char c) void wipeable_string::push_back(char c)