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

3853. [cleanup] Refactor dns_rdataslab_fromrdataset to seperate out

Browse Source 
the handling of a rdataset with no records. [RT #35968]
This commit is contained in:
Mark Andrews
2014-05-20 11:36:03 +10:00
parent fc74b733bf
commit 27b09ceb12
2 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3853. [cleanup] Refactor dns_rdataslab_fromrdataset to seperate out
the handling of a rdataset with no records. [RT #35968]
3852. [func] Increase the default number of clients available 3852. [func] Increase the default number of clients available
for servicing lightweight resolver queries, and for servicing lightweight resolver queries, and
make them configurable via the "lwres-tasks" and make them configurable via the "lwres-tasks" and

61
lib/dns/rdataslab.c
View File

@@ -148,21 +148,36 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
buflen = reservelen + 2; buflen = reservelen + 2;
nalloc = dns_rdataset_count(rdataset); nitems = dns_rdataset_count(rdataset);
nitems = nalloc;
if (nitems == 0 && rdataset->type != 0)
return (ISC_R_FAILURE);
if (nalloc > 0xffff) /*
* If there are no rdata then we can just need to allocate a header
* with zero a record count.
*/
if (nitems == 0) {
if (rdataset->type != 0)
return (ISC_R_FAILURE);
rawbuf = isc_mem_get(mctx, buflen);
if (rawbuf == NULL)
return (ISC_R_NOMEMORY);
region->base = rawbuf;
region->length = buflen;
rawbuf += reservelen;
*rawbuf++ = 0;
*rawbuf = 0;
return (ISC_R_SUCCESS);
}
if (nitems > 0xffff)
return (ISC_R_NOSPACE); return (ISC_R_NOSPACE);
/*
if (nalloc != 0) { * Remember the original number of items.
x = isc_mem_get(mctx, nalloc * sizeof(struct xrdata)); */
if (x == NULL) nalloc = nitems;
return (ISC_R_NOMEMORY); x = isc_mem_get(mctx, nalloc * sizeof(struct xrdata));
} else if (x == NULL)
x = NULL; return (ISC_R_NOMEMORY);
/* /*
* Save all of the rdata members into an array. * Save all of the rdata members into an array.
@@ -180,12 +195,12 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
#endif #endif
result = dns_rdataset_next(rdataset); result = dns_rdataset_next(rdataset);
} }
if (result != ISC_R_NOMORE) if (i != nalloc || result != ISC_R_NOMORE) {
goto free_rdatas;
if (i != nalloc) {
/* /*
* Somehow we iterated over fewer rdatas than * Somehow we iterated over fewer rdatas than
* dns_rdataset_count() said there were! * dns_rdataset_count() said there were or there
* were more items than dns_rdataset_count said
* there were.
*/ */
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
goto free_rdatas; goto free_rdatas;
@@ -194,7 +209,8 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
/* /*
* Put into DNSSEC order. * Put into DNSSEC order.
*/ */
qsort(x, nalloc, sizeof(struct xrdata), compare_rdata); if (nalloc > 1U)
qsort(x, nalloc, sizeof(struct xrdata), compare_rdata);
/* /*
* Remove duplicates and compute the total storage required. * Remove duplicates and compute the total storage required.
@@ -230,17 +246,15 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
buflen++; buflen++;
} }
} }
/* /*
* Don't forget the last item! * Don't forget the last item!
*/ */
if (nalloc != 0) {
#if DNS_RDATASET_FIXED #if DNS_RDATASET_FIXED
buflen += (8 + x[i-1].rdata.length); buflen += (8 + x[i-1].rdata.length);
#else #else
buflen += (2 + x[i-1].rdata.length); buflen += (2 + x[i-1].rdata.length);
#endif #endif
}
/* /*
* Provide space to store the per RR meta data. * Provide space to store the per RR meta data.
*/ */
@@ -330,8 +344,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
free_rdatas: free_rdatas:
if (x != NULL) isc_mem_put(mctx, x, nalloc * sizeof(struct xrdata));
isc_mem_put(mctx, x, nalloc * sizeof(struct xrdata));
return (result); return (result);
} }