mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

Fix undefined behaviour occurrences

Browse Source 
The undefined behaviour was detected by LLVM 17. Fix the affected
functions definitions to match the expected function type.
This commit is contained in:
Aram Sargsyan
2023-10-12 14:10:43 +00:00
parent e17feff9a7
commit 20fdab8667
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/dns/nta.c
View File

@@ -579,7 +579,9 @@ dns_ntatable_save(dns_ntatable_t *ntatable, FILE *fp) {
} }
static void static void
dns__nta_shutdown_cb(dns__nta_t *nta) { dns__nta_shutdown_cb(void *arg) {
dns__nta_t *nta = arg;
REQUIRE(VALID_NTA(nta)); REQUIRE(VALID_NTA(nta));
if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) { if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) {
@@ -602,7 +604,7 @@ dns__nta_shutdown(dns__nta_t *nta) {
REQUIRE(VALID_NTA(nta)); REQUIRE(VALID_NTA(nta));
dns__nta_ref(nta); dns__nta_ref(nta);
isc_async_run(nta->loop, (isc_job_cb)dns__nta_shutdown_cb, nta); isc_async_run(nta->loop, dns__nta_shutdown_cb, nta);
nta->shuttingdown = true; nta->shuttingdown = true;
} }

11
lib/dns/resolver.c
View File

@@ -634,7 +634,7 @@ resquery_connected(isc_result_t eresult, isc_region_t *region, void *arg);
static void static void
fctx_try(fetchctx_t *fctx, bool retrying, bool badcache); fctx_try(fetchctx_t *fctx, bool retrying, bool badcache);
static void static void
fctx_shutdown(fetchctx_t *fctx); fctx_shutdown(void *arg);
static void static void
fctx_minimize_qname(fetchctx_t *fctx); fctx_minimize_qname(fetchctx_t *fctx);
static void static void
@@ -4369,7 +4369,9 @@ fctx_expired(void *arg) {
} }
static void static void
fctx_shutdown(fetchctx_t *fctx) { fctx_shutdown(void *arg) {
fetchctx_t *fctx = arg;
REQUIRE(VALID_FCTX(fctx)); REQUIRE(VALID_FCTX(fctx));
fctx_done_unref(fctx, ISC_R_SHUTTINGDOWN); fctx_done_unref(fctx, ISC_R_SHUTTINGDOWN);
@@ -10151,8 +10153,7 @@ dns_resolver_shutdown(dns_resolver_t *res) {
INSIST(fctx != NULL); INSIST(fctx != NULL);
fetchctx_ref(fctx); fetchctx_ref(fctx);
isc_async_run(fctx->loop, (isc_job_cb)fctx_shutdown, isc_async_run(fctx->loop, fctx_shutdown, fctx);
fctx);
} }
isc_hashmap_iter_destroy(&it); isc_hashmap_iter_destroy(&it);
RWUNLOCK(&res->fctxs_lock, isc_rwlocktype_write); RWUNLOCK(&res->fctxs_lock, isc_rwlocktype_write);
@@ -10495,7 +10496,7 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
if (new_fctx) { if (new_fctx) {
fetchctx_ref(fctx); fetchctx_ref(fctx);
isc_async_run(fctx->loop, (isc_job_cb)fctx_start, fctx); isc_async_run(fctx->loop, fctx_start, fctx);
} }
unlock: unlock:

2
tests/isc/netmgr_common.c
View File

@@ -235,7 +235,7 @@ noop_recv_cb(isc_nmhandle_t *handle ISC_ATTR_UNUSED,
} }
isc_result_t isc_result_t
noop_accept_cb(isc_nmhandle_t *handle ISC_ATTR_UNUSED, unsigned int eresult, noop_accept_cb(isc_nmhandle_t *handle ISC_ATTR_UNUSED, isc_result_t eresult,
void *cbarg ISC_ATTR_UNUSED) { void *cbarg ISC_ATTR_UNUSED) {
F(); F();

2
tests/isc/netmgr_common.h
View File

@@ -235,7 +235,7 @@ noop_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
void *cbarg); void *cbarg);
isc_result_t isc_result_t
noop_accept_cb(isc_nmhandle_t *handle ISC_ATTR_UNUSED, unsigned int result, noop_accept_cb(isc_nmhandle_t *handle ISC_ATTR_UNUSED, isc_result_t result,
void *cbarg ISC_ATTR_UNUSED); void *cbarg ISC_ATTR_UNUSED);
void void