Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	util-internal.h

1 files changed, 12 insertions, 0 deletions

diff --git a/evutil.c b/evutil.c
index c2a29a6c..e49d744f 100644
--- a/evutil.c
+++ b/evutil.c
@@ -2400,6 +2400,18 @@ evutil_weakrand_range_(struct evutil_weakrand_state *state, ev_int32_t top)
 	return result;
 }
 
+/**
+ * Volatile pointer to memset: we use this to keep the compiler from
+ * eliminating our call to memset.
+ */
+void * (*volatile evutil_memset_volatile_)(void *, int, size_t) = memset;
+
+void
+evutil_memclear_(void *mem, size_t len)
+{
+	evutil_memset_volatile_(mem, 0, len);
+}
+
 int
 evutil_sockaddr_is_loopback_(const struct sockaddr *addr)
 {