From 8202d0fb87c540717667bc73aab7461961973b65 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 14 Aug 2019 10:07:22 +0200 Subject: gmputil: assert length is non-zero Importing, exporting and byteswapping zero length data should not happen. Use macro definition so we know from where the assertion is triggered in the code for easier diagnosing in the future. When importing datatype.h from gmputil.h, it seems gcc complains on missing declarations in json.h. Signed-off-by: Pablo Neira Ayuso --- include/gmputil.h | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'include/gmputil.h') diff --git a/include/gmputil.h b/include/gmputil.h index ad63d67b..0cb85a7d 100644 --- a/include/gmputil.h +++ b/include/gmputil.h @@ -52,12 +52,31 @@ extern uint32_t mpz_get_be32(const mpz_t op); extern uint16_t mpz_get_be16(const mpz_t op); enum byteorder; -extern void *mpz_export_data(void *data, const mpz_t op, - enum byteorder byteorder, - unsigned int len); -extern void mpz_import_data(mpz_t rop, const void *data, - enum byteorder byteorder, - unsigned int len); -extern void mpz_switch_byteorder(mpz_t rop, unsigned int len); +extern void *__mpz_export_data(void *data, const mpz_t op, + enum byteorder byteorder, unsigned int len); +extern void __mpz_import_data(mpz_t rop, const void *data, + enum byteorder byteorder, unsigned int len); +extern void __mpz_switch_byteorder(mpz_t rop, unsigned int len); + +#include +#include + +#define mpz_export_data(data, op, byteorder, len) \ +{ \ + assert(len > 0); \ + __mpz_export_data(data, op, byteorder, len); \ +} + +#define mpz_import_data(rop, data, byteorder, len) \ +{ \ + assert(len > 0); \ + __mpz_import_data(rop, data, byteorder, len); \ +} + +#define mpz_switch_byteorder(rop, len) \ +{ \ + assert(len > 0); \ + __mpz_switch_byteorder(rop, len); \ +} #endif /* NFTABLES_GMPUTIL_H */ -- cgit v1.2.3