From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 17 Aug 2018 17:25:36 +0000 (-0400)
Subject: Fix: assume that conditions are valid before being compared
X-Git-Tag: v2.11.0-rc1~131
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=821d5e9214017220a76344df586a0985631c69ae;hp=5f2c1c0ff0173e7ce9a6528d6129563d24687325;p=lttng-tools.git

Fix: assume that conditions are valid before being compared

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/buffer-usage.c b/src/common/buffer-usage.c
index 3d0026081..dbfae89c8 100644
--- a/src/common/buffer-usage.c
+++ b/src/common/buffer-usage.c
@@ -88,6 +88,10 @@ bool lttng_condition_buffer_usage_validate(
 		ERR("Invalid buffer condition: a threshold must be set.");
 		goto end;
 	}
+	if (!usage->domain.set) {
+		ERR("Invalid buffer usage condition: a domain must be set.");
+		goto end;
+	}
 
 	valid = true;
 end:
@@ -194,36 +198,24 @@ bool lttng_condition_buffer_usage_is_equal(const struct lttng_condition *_a,
 		}
 	}
 
-	if ((a->session_name && !b->session_name) ||
-			(!a->session_name && b->session_name)) {
+	/* Condition is not valid if this is not true. */
+	assert(a->session_name);
+	assert(b->session_name);
+	if (strcmp(a->session_name, b->session_name)) {
 		goto end;
 	}
 
-	if (a->channel_name && b->channel_name) {
-		if (strcmp(a->channel_name, b->channel_name)) {
-			goto end;
-		}
-	}	if ((a->channel_name && !b->channel_name) ||
-			(!a->channel_name && b->channel_name)) {
+	assert(a->channel_name);
+	assert(b->channel_name);
+	if (strcmp(a->channel_name, b->channel_name)) {
 		goto end;
 	}
 
-	if (a->channel_name && b->channel_name) {
-		if (strcmp(a->channel_name, b->channel_name)) {
-			goto end;
-		}
-	}
-
-	if ((a->domain.set && !b->domain.set) ||
-			(!a->domain.set && b->domain.set)) {
+	assert(a->domain.set);
+	assert(b->domain.set);
+	if (a->domain.type != b->domain.type) {
 		goto end;
 	}
-
-	if (a->domain.set && b->domain.set) {
-		if (a->domain.type != b->domain.type) {
-			goto end;
-		}
-	}
 	is_equal = true;
 end:
 	return is_equal;
diff --git a/src/common/session-consumed-size.c b/src/common/session-consumed-size.c
index 6ff1c2486..e60437d13 100644
--- a/src/common/session-consumed-size.c
+++ b/src/common/session-consumed-size.c
@@ -136,8 +136,9 @@ bool lttng_condition_session_consumed_size_is_equal(const struct lttng_condition
 		}
 	}
 
-	if ((a->session_name && !b->session_name) ||
-			(!a->session_name && b->session_name)) {
+	assert(a->session_name);
+	assert(b->session_name);
+	if (strcmp(a->session_name, b->session_name)) {
 		goto end;
 	}