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

src/3rdparty: Fix GCC 12.2 warning in access to patricia_t members

Browse source 
Access to members of the larger prefix_t, while safe, throws warnings
when the compiler knows it previously allocated the smaller prefix4_t.

Adapted from 11ae12079ca716f8cfac42cccfd905dad45da18f in the upstream repo.
This commit is contained in:
Christian Kreibich 2022-09-02 16:10:55 -07:00 • committed by Tim Wojtulewicz
parent 01c31e9917
commit 3e4512bc80
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -209,6 +209,7 @@ prefix_t *New_Prefix2(int family, void *dest, int bitlen, prefix_t *prefix)
{ {
int dynamic_allocated = 0; int dynamic_allocated = 0;
int default_bitlen = sizeof(struct in_addr) * 8; int default_bitlen = sizeof(struct in_addr) * 8;
prefix4_t *p4 = NULL;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (family == AF_INET6) { if (family == AF_INET6) {
@ -243,11 +244,12 @@ prefix_t *New_Prefix2(int family, void *dest, int bitlen, prefix_t *prefix)
return (NULL); return (NULL);
} }
prefix->bitlen = (bitlen >= 0) ? bitlen : default_bitlen; p4 = (prefix4_t*) prefix;
prefix->family = family; p4->bitlen = (bitlen >= 0) ? bitlen : default_bitlen;
prefix->ref_count = 0; p4->family = family;
p4->ref_count = 0;
if (dynamic_allocated) { if (dynamic_allocated) {
prefix->ref_count++; p4->ref_count++;
} }
/* fprintf(stderr, "[C %s, %d]\n", prefix_toa (prefix), prefix->ref_count); /* fprintf(stderr, "[C %s, %d]\n", prefix_toa (prefix), prefix->ref_count);
*/ */