diff options
| author | Florian Westphal <fw@strlen.de> | 2015-06-26 10:50:44 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-06-30 02:06:36 +0200 |
| commit | 7feb84a9cce184ce5bb2b6dbbebfbacf16403fb0 (patch) | |
| tree | 4713acdb69d8ff5c093a581c96581714f1807a78 | |
| parent | 1eb09e0de322543c9437d43cae8528db7484d8a3 (diff) | |
datatype: avoid crash in debug mode when printing integers
nft -i --debug=all
nft> add rule ip filter foo mark 42
dies with sigfpe; seems mpz doesn't like len 0:
#1 0x0805f2ee in mpz_export_data (data=0xbfeda588, op=0x9d9fb08, byteorder=BYTEORDER_HOST_ENDIAN, len=0) at gmputil.c:115
After patch this prints 0x0000002a.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/datatype.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datatype.c b/src/datatype.c index f42e3dfb..f79f5d2d 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -156,13 +156,14 @@ out: void symbolic_constant_print(const struct symbol_table *tbl, const struct expr *expr) { + unsigned int len = div_round_up(expr->len, BITS_PER_BYTE); const struct symbolic_constant *s; uint64_t val = 0; /* Export the data in the correct byteorder for comparison */ assert(expr->len / BITS_PER_BYTE <= sizeof(val)); mpz_export_data(constant_data_ptr(val, expr->len), expr->value, - expr->byteorder, expr->len / BITS_PER_BYTE); + expr->byteorder, len); for (s = tbl->symbols; s->identifier != NULL; s++) { if (val == s->value) |