From: Mark Andrews <marka@isc.org>
Date: Thu, 25 Aug 2011 05:56:50 +0000 (+0000)
Subject: silence null pointer dereference warning by adding INSIST(sibling != NULL);
X-Git-Tag: v9.9.0a2~1^2~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f1c29d73f605d020824b9b10257de013917530f;p=thirdparty%2Fbind9.git

silence null pointer dereference warning by adding INSIST(sibling != NULL);
---

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 0c74e09b117..3664d318ce0 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.c,v 1.148 2011/03/12 04:59:48 tbox Exp $ */
+/* $Id: rbt.c,v 1.149 2011/08/25 05:56:50 marka Exp $ */
 
 /*! \file */
 
@@ -1929,6 +1929,8 @@ dns_rbt_deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
 					sibling = RIGHT(parent);
 				}
 
+				INSIST(sibling != NULL);
+
 				if (IS_BLACK(LEFT(sibling)) &&
 				    IS_BLACK(RIGHT(sibling))) {
 					MAKE_RED(sibling);
@@ -1965,6 +1967,8 @@ dns_rbt_deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
 					sibling = LEFT(parent);
 				}
 
+				INSIST(sibling != NULL);
+
 				if (IS_BLACK(LEFT(sibling)) &&
 				    IS_BLACK(RIGHT(sibling))) {
 					MAKE_RED(sibling);