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

memwipe: don't call the workhorse for 0 bytes 

Some of them don't like it
This commit is contained in:
moneromooo-monero 2018-07-10 14:37:56 +01:00
parent eed4dba880
commit 8d578f1f2d
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/src/memwipe.c
View File

@ -50,7 +50,7 @@
void *memwipe(void *ptr, size_t n) void *memwipe(void *ptr, size_t n)
{ {
if (memset_s(ptr, n, 0, n)) if (n > 0 && memset_s(ptr, n, 0, n))
{ {
#ifdef NDEBUG #ifdef NDEBUG
fprintf(stderr, "Error: memset_s failed\n"); fprintf(stderr, "Error: memset_s failed\n");
@ -67,6 +67,7 @@ void *memwipe(void *ptr, size_t n)
void *memwipe(void *ptr, size_t n) void *memwipe(void *ptr, size_t n)
{ {
if (n > 0)
explicit_bzero(ptr, n); explicit_bzero(ptr, n);
SCARECROW SCARECROW
return ptr; return ptr;
@ -105,6 +106,7 @@ static void memory_cleanse(void *ptr, size_t len)
void *memwipe(void *ptr, size_t n) void *memwipe(void *ptr, size_t n)
{ {
if (n > 0)
memory_cleanse(ptr, n); memory_cleanse(ptr, n);
SCARECROW SCARECROW
return ptr; return ptr;