diff options
| author | Christof Schmitt <cs@samba.org> | 2020-08-18 12:48:09 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-08-24 03:10:09 +0000 |
| commit | d3109a11c8dbfbe3afec8fdfe44371ab13780dc6 (patch) | |
| tree | c9c4e71ebd918edc58ec2ce487e8e8f07801fde7 /lib/util | |
| parent | c057586fc85e84a51c9611714df454b188da2da5 (diff) | |
| download | samba-d3109a11c8dbfbe3afec8fdfe44371ab13780dc6.tar.gz | |
lib/util: Move cleanup for unit test in teardown function
Where to call rmdir does not matter, but that should avoid the TOCTOU
warning from CID 1466194 and might be slightly cleaner.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Aug 24 03:10:09 UTC 2020 on sn-devel-184
Diffstat (limited to 'lib/util')
| -rw-r--r-- | lib/util/tests/test_util.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/util/tests/test_util.c b/lib/util/tests/test_util.c index ad21642357d..e547668ade3 100644 --- a/lib/util/tests/test_util.c +++ b/lib/util/tests/test_util.c @@ -130,9 +130,14 @@ static void test_directory_create_or_exists_none(void **state) assert_return_code(ret, errno); assert_int_equal(sbuf.st_mode & 0777, 0775); assert_true(S_ISDIR(sbuf.st_mode)); +} - ret = rmdir(paths->none); - assert_return_code(ret, errno); +static int teardown_none_directory(void **state) +{ + struct test_paths *paths = *state; + + rmdir(paths->none); + return 0; } static void test_directory_create_or_exists_dir(void **state) @@ -218,7 +223,8 @@ static void test_directory_create_or_exists_symlink_file(void **state) int main(int argc, char **argv) { const struct CMUnitTest tests[] = { - cmocka_unit_test(test_directory_create_or_exists_none), + cmocka_unit_test_teardown(test_directory_create_or_exists_none, + teardown_none_directory), cmocka_unit_test(test_directory_create_or_exists_dir), cmocka_unit_test(test_directory_create_or_exists_file), cmocka_unit_test(test_directory_create_or_exists_symlink_none), |