Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4126

Browse Source 
8d578f1 memwipe: don't call the workhorse for 0 bytes (moneromooo-monero)
This commit is contained in:
luigi1111 2018-07-27 14:29:55 -05:00
commit 21b1fa1c35
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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,7 +67,8 @@ void *memwipe(void *ptr, size_t n)
void *memwipe(void *ptr, size_t n) void *memwipe(void *ptr, size_t n)
{ {
explicit_bzero(ptr, n); if (n > 0)
explicit_bzero(ptr, n);
SCARECROW SCARECROW
return ptr; return ptr;
} }
@ -105,7 +106,8 @@ static void memory_cleanse(void *ptr, size_t len)
void *memwipe(void *ptr, size_t n) void *memwipe(void *ptr, size_t n)
{ {
memory_cleanse(ptr, n); if (n > 0)
memory_cleanse(ptr, n);
SCARECROW SCARECROW
return ptr; return ptr;
} }