oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Avoid -Werror=strict-overflow on in rk_dns_srv_order()

Browse Source 
In a strict Samba build with -Werror=strict-overflow on Ubuntu 18.04
with gcc version 7.5.0 (Ubuntu 7.5.0-3ubuntu1~18.04)
we see

../../source4/heimdal/lib/roken/resolve.c: In function ‘rk_dns_srv_order’:
../../source4/heimdal/lib/roken/resolve.c:639:7: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow]
     if(num_srv == 0)
       ^
cc1: all warnings being treated as errors

This avoids the issue by additionally setting a distinct flag.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Bartlett
2021-07-06 13:10:16 +12:00
committed by Luke Howard
parent 034bc1649d
commit 75829cad18
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/roken/resolve.c
View File

@@ -629,14 +629,17 @@ rk_dns_srv_order(struct rk_dns_reply *r)
struct rk_resource_record **srvs, **ss, **headp; struct rk_resource_record **srvs, **ss, **headp;
struct rk_resource_record *rr; struct rk_resource_record *rr;
int num_srv = 0; int num_srv = 0;
unsigned int srv_found = FALSE;
rk_random_init(); rk_random_init();
for(rr = r->head; rr; rr = rr->next) for(rr = r->head; rr; rr = rr->next)
if(rr->type == rk_ns_t_srv) if(rr->type == rk_ns_t_srv) {
num_srv++; num_srv++;
srv_found = TRUE;
}
if(num_srv == 0) if(srv_found == FALSE)
return; return;
srvs = malloc(num_srv * sizeof(*srvs)); srvs = malloc(num_srv * sizeof(*srvs));