From d7c81433080e41253dc31d41028686c5ab332b44 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 14 Feb 2017 14:40:25 -0700 Subject: [PATCH] test/string: add fatal asserts for NULL strings Make sure that the output strings are not NULL before comparing them with strcmp(). This silences some scan-build warnings. Change-Id: I3bfb7e44abe0451ae8afb4647c3b2d3f787b4faa Signed-off-by: Daniel Verkamp --- test/lib/util/string/string_ut.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/lib/util/string/string_ut.c b/test/lib/util/string/string_ut.c index 7ded12af7..6a07a2f66 100644 --- a/test/lib/util/string/string_ut.c +++ b/test/lib/util/string/string_ut.c @@ -49,6 +49,7 @@ test_parse_ip_addr(void) snprintf(ip, 255, "%s", "192.168.0.1"); rc = spdk_parse_ip_addr(ip, &host, &port); CU_ASSERT_EQUAL(rc, 0); + SPDK_CU_ASSERT_FATAL(host != NULL); CU_ASSERT(strcmp(host, "192.168.0.1") == 0); CU_ASSERT_EQUAL(strlen(host), 11); CU_ASSERT_EQUAL(port, NULL); @@ -57,8 +58,10 @@ test_parse_ip_addr(void) snprintf(ip, 255, "%s", "123.456.789.0:5520"); rc = spdk_parse_ip_addr(ip, &host, &port); CU_ASSERT_EQUAL(rc, 0); + SPDK_CU_ASSERT_FATAL(host != NULL); CU_ASSERT(strcmp(host, "123.456.789.0") == 0); CU_ASSERT_EQUAL(strlen(host), 13); + SPDK_CU_ASSERT_FATAL(port != NULL); CU_ASSERT(strcmp(port, "5520") == 0); CU_ASSERT_EQUAL(strlen(port), 4); @@ -66,6 +69,7 @@ test_parse_ip_addr(void) snprintf(ip, 255, "%s", "[2001:db8:85a3:8d3:1319:8a2e:370:7348]"); rc = spdk_parse_ip_addr(ip, &host, &port); CU_ASSERT_EQUAL(rc, 0); + SPDK_CU_ASSERT_FATAL(host != NULL); CU_ASSERT(strcmp(host, "2001:db8:85a3:8d3:1319:8a2e:370:7348") == 0); CU_ASSERT_EQUAL(strlen(host), 36); CU_ASSERT_EQUAL(port, NULL); @@ -74,8 +78,10 @@ test_parse_ip_addr(void) snprintf(ip, 255, "%s", "[2001:db8:85a3:8d3:1319:8a2e:370:7348]:443"); rc = spdk_parse_ip_addr(ip, &host, &port); CU_ASSERT_EQUAL(rc, 0); + SPDK_CU_ASSERT_FATAL(host != NULL); CU_ASSERT(strcmp(host, "2001:db8:85a3:8d3:1319:8a2e:370:7348") == 0); CU_ASSERT_EQUAL(strlen(host), 36); + SPDK_CU_ASSERT_FATAL(port != NULL); CU_ASSERT(strcmp(port, "443") == 0); CU_ASSERT_EQUAL(strlen(port), 3); @@ -83,6 +89,7 @@ test_parse_ip_addr(void) snprintf(ip, 255, "%s", "[2001:db8:85a3:8d3:1319:8a2e:370:7348]:"); rc = spdk_parse_ip_addr(ip, &host, &port); CU_ASSERT_EQUAL(rc, 0); + SPDK_CU_ASSERT_FATAL(host != NULL); CU_ASSERT(strcmp(host, "2001:db8:85a3:8d3:1319:8a2e:370:7348") == 0); CU_ASSERT_EQUAL(strlen(host), 36); CU_ASSERT_EQUAL(port, NULL);