From cce6edeef0e3829fb88185cebf13b21963afe032 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 23 Dec 2010 14:33:16 +0100 Subject: Listing/saving of large sets could produce broken listing, fixed. The wrapper around getnameinfo was not snprintf-compatible and that could cause broken listing/saving for large sets. --- lib/print.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/print.c') diff --git a/lib/print.c b/lib/print.c index 767fd04..b6819e5 100644 --- a/lib/print.c +++ b/lib/print.c @@ -162,7 +162,9 @@ __getnameinfo##f(char *buf, unsigned int len, \ sizeof(saddr), \ buf, len, NULL, 0, \ flags | NI_NUMERICHOST); \ - return (err != 0 ? -1 : (int)strlen(buf)); \ + D("getnameinfo err: %i, errno %i", err, errno); \ + return (err == 0 ? (int)strlen(buf) : \ + (err == EAI_OVERFLOW || err == EAI_SYSTEM) ? (int)len : -1);\ } #define SNPRINTF_IP(mask, f) \ @@ -236,6 +238,7 @@ ipset_print_ip(char *buf, unsigned int len, size = snprintf_ipv6(buf, len, flags, ip, cidr); else return -1; + D("size %i, len %u", size, len); SNPRINTF_FAILURE(size, len, offset); D("len: %u, offset %u", len, offset); -- cgit v1.2.3