From fc1bc0718b6c414335db3c602af33517748165f1 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 4 Sep 2014 13:22:54 -0700 Subject: [PATCH] The C standard says nothing about accesses via lvalue expressions with volatile types --- src/libsodium/sodium/utils.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index efb92638..23b0bf6a 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -69,12 +69,8 @@ sodium_memzero(void * const pnt, const size_t len) memset(pnt, 0, len); __sodium_dummy_symbol_to_prevent_lto(pnt, len); #else - volatile unsigned char *pnt_ = (volatile unsigned char *) pnt; - size_t i = (size_t) 0U; - - while (i < len) { - pnt_[i++] = 0U; - } + static void * (* const volatile memset_ptr)(void *, int, size_t) = memset; + memset_ptr(pnt, 0, len); #endif }