clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 06:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix alloc-size and calloc-transposed-args compiler warnings.

Browse Source
This commit is contained in:
Yorgos Thessalonikefs 2024-09-06 16:01:30 +02:00
parent 7ecff4113c
commit c36ce2a390
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/Changelog
View File

@ -1,3 +1,6 @@
6 September 2024: Yorgos
- Fix alloc-size and calloc-transposed-args compiler warnings.
5 September 2024: Wouter 5 September 2024: Wouter
- Fix config file read for dnstap-sample-rate. - Fix config file read for dnstap-sample-rate.

2
libunbound/context.c
View File

@ -395,7 +395,7 @@ context_serialize_cancel(struct ctx_query* q, uint32_t* len)
/* format of cancel: /* format of cancel:
* o uint32 cmd * o uint32 cmd
* o uint32 async-id */ * o uint32 async-id */
uint8_t* p = (uint8_t*)reallocarray(NULL, sizeof(uint32_t), 2); uint8_t* p = (uint8_t*)reallocarray(NULL, 2, sizeof(uint32_t));
if(!p) return NULL; if(!p) return NULL;
*len = 2*sizeof(uint32_t); *len = 2*sizeof(uint32_t);
sldns_write_uint32(p, UB_LIBCMD_CANCEL); sldns_write_uint32(p, UB_LIBCMD_CANCEL);

6
testcode/perf.c
View File

@ -220,7 +220,7 @@ perfsetup(struct perfinfo* info)
#endif #endif
signal(SIGTERM, perf_sigh) == SIG_ERR) signal(SIGTERM, perf_sigh) == SIG_ERR)
fatal_exit("could not bind to signal"); fatal_exit("could not bind to signal");
info->io = (struct perfio*)calloc(sizeof(struct perfio), info->io_num); info->io = (struct perfio*)calloc(info->io_num, sizeof(struct perfio));
if(!info->io) fatal_exit("out of memory"); if(!info->io) fatal_exit("out of memory");
#ifndef S_SPLINT_S #ifndef S_SPLINT_S
FD_ZERO(&info->rset); FD_ZERO(&info->rset);
@ -501,8 +501,8 @@ qlist_grow_capacity(struct perfinfo* info)
{ {
size_t newcap = (size_t)((info->qlist_capacity==0)?16: size_t newcap = (size_t)((info->qlist_capacity==0)?16:
info->qlist_capacity*2); info->qlist_capacity*2);
uint8_t** d = (uint8_t**)calloc(sizeof(uint8_t*), newcap); uint8_t** d = (uint8_t**)calloc(newcap, sizeof(uint8_t*));
size_t* l = (size_t*)calloc(sizeof(size_t), newcap); size_t* l = (size_t*)calloc(newcap, sizeof(size_t));
if(!d || !l) fatal_exit("out of memory"); if(!d || !l) fatal_exit("out of memory");
if(info->qlist_data && info->qlist_capacity) if(info->qlist_data && info->qlist_capacity)
memcpy(d, info->qlist_data, sizeof(uint8_t*)* memcpy(d, info->qlist_data, sizeof(uint8_t*)*

2
testcode/testbound.c
View File

@ -502,7 +502,7 @@ struct listen_port* daemon_remote_open_ports(struct config_file*
struct daemon_remote* daemon_remote_create(struct config_file* ATTR_UNUSED(cfg)) struct daemon_remote* daemon_remote_create(struct config_file* ATTR_UNUSED(cfg))
{ {
return (struct daemon_remote*)calloc(1,1); return (struct daemon_remote*)calloc(1, sizeof(struct daemon_remote));
} }
void daemon_remote_delete(struct daemon_remote* rc) void daemon_remote_delete(struct daemon_remote* rc)

4
validator/validator.c
View File

@ -97,8 +97,8 @@ fill_nsec3_iter(struct val_env* ve, char* s, int c)
int i; int i;
free(ve->nsec3_keysize); free(ve->nsec3_keysize);
free(ve->nsec3_maxiter); free(ve->nsec3_maxiter);
ve->nsec3_keysize = (size_t*)calloc(sizeof(size_t), (size_t)c); ve->nsec3_keysize = (size_t*)calloc((size_t)c, sizeof(size_t));
ve->nsec3_maxiter = (size_t*)calloc(sizeof(size_t), (size_t)c); ve->nsec3_maxiter = (size_t*)calloc((size_t)c, sizeof(size_t));
if(!ve->nsec3_keysize || !ve->nsec3_maxiter) { if(!ve->nsec3_keysize || !ve->nsec3_maxiter) {
log_err("out of memory"); log_err("out of memory");
return 0; return 0;