Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

src/3rdparty: Use snprintf in zeek_inet_ntop.c to silence macOS compiler warnings

Browse source
This commit is contained in:
Tim Wojtulewicz 2023-02-06 12:24:34 -07:00
parent a2abb40af6
commit b8248d07e9
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/3rdparty/zeek_inet_ntop.c vendored
View file

@ -106,7 +106,8 @@ zeek_inet_ntop6(const u_char *src, char *dst, socklen_t size)
* Keep this in mind if you think this function should have been coded * Keep this in mind if you think this function should have been coded
* to use pointer overlays. All the world's not a VAX. * to use pointer overlays. All the world's not a VAX.
*/ */
char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; const int tmp_size = sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255");
char tmp[tmp_size], *tp;
struct { int base, len; } best, cur; struct { int base, len; } best, cur;
u_int words[NS_IN6ADDRSZ / NS_INT16SZ]; u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
int i; int i;
@ -147,13 +148,17 @@ zeek_inet_ntop6(const u_char *src, char *dst, socklen_t size)
/* /*
* Format the result. * Format the result.
*/ */
int remaining = tmp_size;
tp = tmp; tp = tmp;
for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
/* Are we inside the best run of 0x00's? */ /* Are we inside the best run of 0x00's? */
if (best.base != -1 && i >= best.base && if (best.base != -1 && i >= best.base &&
i < (best.base + best.len)) { i < (best.base + best.len)) {
if (i == best.base) if (i == best.base)
{
*tp++ = ':'; *tp++ = ':';
remaining--;
}
continue; continue;
} }
/* Are we following an initial run of 0x00s or any real hex? */ /* Are we following an initial run of 0x00s or any real hex? */
@ -167,9 +172,10 @@ zeek_inet_ntop6(const u_char *src, char *dst, socklen_t size)
if (!zeek_inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) if (!zeek_inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
return (NULL); return (NULL);
tp += strlen(tp); tp += strlen(tp);
remaining -= strlen(tp);
break; break;
} }
tp += sprintf(tp, "%x", words[i]); tp += snprintf(tp, remaining, "%x", words[i]);
} }
/* Was it a trailing run of 0x00's? */ /* Was it a trailing run of 0x00's? */
if (best.base != -1 && (best.base + best.len) == if (best.base != -1 && (best.base + best.len) ==