From c2201e153e701130fbd08c75765b330f9280144f Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 20 Jun 2014 02:24:40 +0000 Subject: Merge from OpenBSD - Marc Espie improved the ohash interface: * rename the halloc callback to calloc, provide overflow protection * rename the hfree callback to free, drop the useless size argument * prevent integer overflows in ohash_resize --- compat_ohash.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compat_ohash.h') diff --git a/compat_ohash.h b/compat_ohash.h index d07df18e..c5f81ec0 100644 --- a/compat_ohash.h +++ b/compat_ohash.h @@ -27,8 +27,8 @@ struct ohash_info { ptrdiff_t key_offset; void *data; /* user data */ - void *(*halloc)(size_t, void *); - void (*hfree)(void *, size_t, void *); + void *(*calloc)(size_t, size_t, void *); + void (*free)(void *, void *); void *(*alloc)(size_t, void *); }; -- cgit v1.2.3-56-ge451