ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

lib/dns/rdatalist.c: Fix dereference before DbC check

Browse Source 
(cherry picked from commit 5fc7e98d29)
This commit is contained in:
Ondřej Surý
2019-09-27 11:37:27 +02:00
parent 8a01f18958
commit d76c92bba7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/dns/rdatalist.c
View File

@@ -242,14 +242,17 @@ isc_result_t
isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name,
dns_rdataset_t *neg, dns_rdataset_t *negsig)
{
dns_rdataclass_t rdclass = rdataset->rdclass;
dns_rdataclass_t rdclass;
dns_rdataset_t *tneg = NULL;
dns_rdataset_t *tnegsig = NULL;
dns_name_t *noqname = rdataset->private6;
dns_name_t *noqname;
REQUIRE(rdataset != NULL);
REQUIRE((rdataset->attributes & DNS_RDATASETATTR_NOQNAME) != 0);
rdclass = rdataset->rdclass;
noqname = rdataset->private6;
(void)dns_name_dynamic(noqname); /* Sanity Check. */
for (rdataset = ISC_LIST_HEAD(noqname->list);
@@ -333,14 +336,17 @@ isc_result_t
isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name,
dns_rdataset_t *neg, dns_rdataset_t *negsig)
{
dns_rdataclass_t rdclass = rdataset->rdclass;
dns_rdataclass_t rdclass;
dns_rdataset_t *tneg = NULL;
dns_rdataset_t *tnegsig = NULL;
dns_name_t *closest = rdataset->private7;
dns_name_t *closest;
REQUIRE(rdataset != NULL);
REQUIRE((rdataset->attributes & DNS_RDATASETATTR_CLOSEST) != 0);
rdclass = rdataset->rdclass;
closest = rdataset->private7;
(void)dns_name_dynamic(closest); /* Sanity Check. */
for (rdataset = ISC_LIST_HEAD(closest->list);