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

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

This also fixes CID 1125584.

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 bbf0b907cb04184515d0f5f09f14824df1c2e59f)
---

diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index 5a5c649a7f1..d73a43eb925 100644
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -217,7 +217,7 @@ static inline void trbt_set_color(trbt_node_t *node, int color)
 }
 static inline void trbt_set_color_left(trbt_node_t *node, int color)
 {
-	if ( ((node==NULL)||(node->left==NULL)) && (color==TRBT_BLACK) ) {
+	if (node == NULL || node->left == NULL) {
 		return;
 	}
 	node->left->rb_color = color;