From: Mark Andrews <marka@isc.org>
Date: Sat, 13 Jul 2013 14:26:23 +0000 (+1000)
Subject: fix unchecked null; value not read
X-Git-Tag: v9.10.0a1~205
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=09fec186691a7f75cfa65466fccdc5dae0337889;p=thirdparty%2Fbind9.git

fix unchecked null; value not read
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index a8d78614e18..5f5b510bd98 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2983,6 +2983,11 @@ zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) {
 		dns_db_attach(zone->db, &db);
 	ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read);
 
+	if (db == NULL) {
+		result = ISC_R_SUCCESS;
+		goto cleanup;
+	}
+
 	dns_db_currentversion(db, &version);
 	result = dns_nsec_nseconly(db, version, &nseconly);
 	nsec3ok = (result == ISC_R_SUCCESS && !nseconly);
@@ -3121,10 +3126,8 @@ resume_addnsec3chain(dns_zone_t *zone) {
 	if (zone->db != NULL)
 		dns_db_attach(zone->db, &db);
 	ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read);
-	if (db == NULL) {
-		result = ISC_R_FAILURE;
+	if (db == NULL)
 		goto cleanup;
-	}
 
 	result = dns_db_findnode(db, &zone->origin, ISC_FALSE, &node);
 	if (result != ISC_R_SUCCESS)