From b0e7b294224030abc534c396fffcab9fbce12b11 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 14 Jun 2021 14:47:47 +0200 Subject: src: add xzalloc_array() and use it to allocate the expression hashtable Otherwise, assertion to ensure that no colission occur is hit due to uninitialized hashtable memory area: nft: netlink_delinearize.c:1741: expr_handler_init: Assertion `expr_handle_ht[hash] == NULL' failed. Fixes: c4058f96c6a5 ("netlink_delinearize: Fix suspicious calloc() call") Acked-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/utils.c') diff --git a/src/utils.c b/src/utils.c index 47f5b791..925841c5 100644 --- a/src/utils.c +++ b/src/utils.c @@ -50,6 +50,16 @@ void *xmalloc_array(size_t nmemb, size_t size) return xmalloc(nmemb * size); } +void *xzalloc_array(size_t nmemb, size_t size) +{ + void *ptr; + + ptr = xmalloc_array(nmemb, size); + memset(ptr, 0, nmemb * size); + + return ptr; +} + void *xrealloc(void *ptr, size_t size) { ptr = realloc(ptr, size); -- cgit v1.2.3