From 46b7940cd8cabb29c62fc063854d7eaeb906b902 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Wed, 6 Jun 2018 18:33:59 -0400 Subject: [PATCH] Fix assert hygiene in t_path.c Correct all uses of side-effecting asserts in t_path.c so that it works correctly when NDEBUG is defined. Reported by Nehal J Wani. ticket: 8689 --- src/util/support/t_path.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/util/support/t_path.c b/src/util/support/t_path.c index 2ac91d8ec3..111c27a5d0 100644 --- a/src/util/support/t_path.c +++ b/src/util/support/t_path.c @@ -136,12 +136,16 @@ main(void) edirname = split_tests[i].posix_dirname; ebasename = split_tests[i].posix_basename; #endif - assert(k5_path_split(ipath, NULL, NULL) == 0); - assert(k5_path_split(ipath, &dirname, NULL) == 0); + if (k5_path_split(ipath, NULL, NULL) != 0) + abort(); + if (k5_path_split(ipath, &dirname, NULL) != 0) + abort(); free(dirname); - assert(k5_path_split(ipath, NULL, &basename) == 0); + if (k5_path_split(ipath, NULL, &basename) != 0) + abort(); free(basename); - assert(k5_path_split(ipath, &dirname, &basename) == 0); + if (k5_path_split(ipath, &dirname, &basename) != 0) + abort(); if (strcmp(dirname, edirname) != 0) { fprintf(stderr, "Split test %d: dirname %s != expected %s\n", (int)i, dirname, edirname); @@ -164,7 +168,8 @@ main(void) #else ejoined = join_tests[i].posix_result; #endif - assert(k5_path_join(path1, path2, &joined) == 0); + if (k5_path_join(path1, path2, &joined) != 0) + abort(); if (strcmp(joined, ejoined) != 0) { fprintf(stderr, "Join test %d: %s != expected %s\n", (int)i, joined, ejoined); -- 2.47.2