upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-25 02:42:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

3278. [bug] Hold a internal reference to the zone while performing

Browse source 
a asynchronous load.  Address potential memory leak
                        if the asynchronous is cancelled. [RT #27750]
This commit is contained in:
Mark Andrews 2012-02-07 00:47:21 +00:00
parent f4bd753e0b
commit fc3b3e1f7e
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,7 @@
3278. [bug] Hold a internal reference to the zone while performing
a asynchronous load. Address potential memory leak
if the asynchronous is cancelled. [RT #27750]
3277. [bug] Make sure automatic key maintenance is started
when "auto-dnssec maintain" is turned on during
"rndc reconfig". [RT #26805]
@ -8,7 +12,7 @@
safe_open failure. [RT #27696]
3275. [bug] Corrected rndc -h output; the 'rndc sync -clean'
option had been missplled as '-clear'. (To avoid
option had been misspelled as '-clear'. (To avoid
future confusion, both options now work.) [RT #27173]
3274. [placeholder]

9
lib/dns/zone.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.671 2012/02/03 12:59:03 marka Exp $ */
/* $Id: zone.c,v 1.672 2012/02/07 00:47:21 marka Exp $ */
/*! \file */
@ -1711,7 +1711,7 @@ zone_asyncload(isc_task_t *task, isc_event_t *event) {
isc_event_free(&event);
if (result == ISC_R_CANCELED ||
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING))
return;
goto cleanup;
zone_load(zone, 0);
@ -1723,7 +1723,9 @@ zone_asyncload(isc_task_t *task, isc_event_t *event) {
if (asl->loaded != NULL)
(asl->loaded)(asl->loaded_arg, zone, task);
cleanup:
isc_mem_put(zone->mctx, asl, sizeof (*asl));
dns_zone_idetach(&zone);
}
isc_result_t
@ -1741,7 +1743,7 @@ dns_zone_asyncload(dns_zone_t *zone, dns_zt_zoneloaded_t done, void *arg) {
if (asl == NULL)
CHECK(ISC_R_NOMEMORY);
asl->zone = zone;
asl->zone = NULL;
asl->loaded = done;
asl->loaded_arg = arg;
@ -1753,6 +1755,7 @@ dns_zone_asyncload(dns_zone_t *zone, dns_zt_zoneloaded_t done, void *arg) {
CHECK(ISC_R_NOMEMORY);
LOCK_ZONE(zone);
zone_iattach(zone, &asl->zone);
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADPENDING);
isc_task_send(zone->loadtask, &e);
UNLOCK_ZONE(zone);