From: Martin Schwenke <martin@meltin.net>
Date: Fri, 5 Aug 2016 06:39:50 +0000 (+1000)
Subject: ctdb-common: Fix CID 1125585 Dereference after null check (FORWARD_NULL)
X-Git-Tag: samba-4.3.12~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09cbfa6c9c87f864bb4b044e27dcbb944855aa22;p=thirdparty%2Fsamba.git

ctdb-common: Fix CID 1125585 Dereference after null check (FORWARD_NULL)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit b4f23a7e95cd9c8fc4a6324d4ec5a2881eaec207)
---

diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index d73a43eb925..18418f33784 100644
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -210,7 +210,7 @@ static inline int trbt_get_color_right(trbt_node_t *node)
 /* setting a NULL node to black is a nop */
 static inline void trbt_set_color(trbt_node_t *node, int color)
 {
-	if ( (node==NULL) && (color==TRBT_BLACK) ) {
+	if (node == NULL) {
 		return;
 	}
 	node->rb_color = color;