From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 18 May 2016 18:40:51 +0000 (-0400)
Subject: Tests: abort test on memory allocation failure
X-Git-Tag: v2.8.0~42
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1b817c8449927c356a57782a63f5e1e6706119f6;p=lttng-tools.git

Tests: abort test on memory allocation failure

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

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 236f507bb..4d1762f54 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -165,12 +165,12 @@ static void test_create_ust_event_exclusion(void)
 	/* set up an exclusion set */
 	exclusion = zmalloc(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
 		PERROR("zmalloc");
+		return;
 	}
 
-	ok(exclusion != NULL, "Create UST exclusion");
-
 	exclusion->count = exclusion_count;
 	random_name = get_random_string();
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), random_name,
@@ -179,17 +179,18 @@ static void test_create_ust_event_exclusion(void)
 		LTTNG_SYMBOL_NAME_LEN);
 
 	event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false);
+	exclusion = NULL;
 
 	ok(!event, "Create UST event with identical exclusion names fails");
 
 	exclusion = zmalloc(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
 		PERROR("zmalloc");
+		return;
 	}
 
-	ok(exclusion != NULL, "Create UST exclusion");
-
 	exclusion->count = exclusion_count;
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
 		get_random_string(), LTTNG_SYMBOL_NAME_LEN);