From: Mark Andrews <marka@isc.org>
Date: Tue, 16 Nov 2010 00:49:18 +0000 (+0000)
Subject: INSIST that bucket in no longer ISC_ADB_INVALIDBUCKET after find_*_and_lock calls
X-Git-Tag: v9.8.0-P1~353
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a158495f84adf06c340dea4da8cb1f337e611ebf;p=thirdparty%2Fbind9.git

INSIST that bucket in no longer ISC_ADB_INVALIDBUCKET after find_*_and_lock calls
---

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 10fd62166eb..dfff33bb514 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.249 2010/08/13 23:47:03 tbox Exp $ */
+/* $Id: adb.c,v 1.250 2010/11/16 00:49:18 marka Exp $ */
 
 /*! \file
  *
@@ -2350,6 +2350,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
 	 */
 	bucket = DNS_ADB_INVALIDBUCKET;
 	adbname = find_name_and_lock(adb, name, find->options, &bucket);
+	INSIST(bucket != DNS_ADB_INVALIDBUCKET);
 	if (adb->name_sd[bucket]) {
 		DP(DEF_LEVEL,
 		   "dns_adb_createfind: returning ISC_R_SHUTTINGDOWN");
@@ -3472,6 +3473,7 @@ dns_adb_findaddrinfo(dns_adb_t *adb, isc_sockaddr_t *sa,
 	result = ISC_R_SUCCESS;
 	bucket = DNS_ADB_INVALIDBUCKET;
 	entry = find_entry_and_lock(adb, sa, &bucket, now);
+	INSIST(bucket != DNS_ADB_INVALIDBUCKET);
 	if (adb->entry_sd[bucket]) {
 		result = ISC_R_SHUTTINGDOWN;
 		goto unlock;