Merge pull request #4126

8d578f1 memwipe: don't call the workhorse for 0 bytes (moneromooo-monero)
monero-project · Jul 27, 2018 · 21b1fa1 · 21b1fa1
2 parents ff01c3a + 8d578f1
commit 21b1fa1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/contrib/epee/src/memwipe.c b/contrib/epee/src/memwipe.c
@@ -50,7 +50,7 @@
 
 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
     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)
 {
-  explicit_bzero(ptr, n);
+  if (n > 0)
+    explicit_bzero(ptr, n);
   SCARECROW
   return ptr;
 }
@@ -105,7 +106,8 @@ static void memory_cleanse(void *ptr, size_t len)
 
 void *memwipe(void *ptr, size_t n)
 {
-  memory_cleanse(ptr, n);
+  if (n > 0)
+    memory_cleanse(ptr, n);
   SCARECROW
   return ptr;
 }