Merge branch '3884-cid-436299-null-pointer-dereference-in-lib-dns-resolver-c' into 'main'

Resolve "CID 436299: Null pointer dereference in lib/dns/resolver.c"

Closes #3884

See merge request isc-projects/bind9!7562
This commit is contained in:
Mark Andrews 2023-02-21 12:58:25 +00:00
commit b2923ce356

View file

@ -10613,11 +10613,10 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
}
/* On success, the fctx is locked in get_attached_fctx() */
INSIST(!SHUTTINGDOWN(fctx));
/* Is this a duplicate? */
if (fctx != NULL && client != NULL) {
if (client != NULL) {
dns_fetchresponse_t *resp = NULL;
for (resp = ISC_LIST_HEAD(fctx->resps); resp != NULL;
resp = ISC_LIST_NEXT(resp, link))
@ -10632,7 +10631,6 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
}
}
if (count >= spillatmin && spillatmin != 0) {
INSIST(fctx != NULL);
if (count >= spillat) {
fctx->spilled = true;
}