summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Biro <nurupo.contributions@gmail.com>2017-01-06 16:22:59 -0500
committerMaxim Biro <nurupo.contributions@gmail.com>2017-01-06 16:32:39 -0500
commite7270aa99d7effb85ac763de3cedad64ecb85267 (patch)
treef0082dd3e075acb4632effa5b67ebdc22bc440c0
parente4d81e1520f34644fc25ddbe3c869c2ee7766f47 (diff)
Fix bad attempt at refactoring
-rw-r--r--toxcore/crypto_core_mem.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/toxcore/crypto_core_mem.c b/toxcore/crypto_core_mem.c
index 8d469986..0f199794 100644
--- a/toxcore/crypto_core_mem.c
+++ b/toxcore/crypto_core_mem.c
@@ -37,13 +37,15 @@ void crypto_memzero(void *data, size_t length)
37 sodium_memzero(data, length); 37 sodium_memzero(data, length);
38#else 38#else
39#ifdef _WIN32 39#ifdef _WIN32
40 SecureZeroMemory(pnt, len); 40 SecureZeroMemory(data, length);
41#elif defined(HAVE_MEMSET_S) 41#elif defined(HAVE_MEMSET_S)
42 42
43 errno_t code = memset_s(data, (rsize_t) length, 0, (rsize_t) length) 43 if (length > 0U) {
44 errno_t code = memset_s(data, (rsize_t) length, 0, (rsize_t) length);
44 45
45 if (len > 0U && code != 0) { 46 if (code != 0) {
46 abort(); /* LCOV_EXCL_LINE */ 47 abort(); /* LCOV_EXCL_LINE */
48 }
47 } 49 }
48 50
49#elif defined(HAVE_EXPLICIT_BZERO) 51#elif defined(HAVE_EXPLICIT_BZERO)