From b769e936d0118b7c3870ffc082b44254164bfedd Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Wed, 1 Aug 2012 14:49:47 -0700 Subject: [PATCH] Don't reference stack vars in cleanup callback If you use the clar cleanup callback function, you can't pass a reference pointer to a stack allocated variable because when the cleanup function runs, the stack won't exist anymore. --- tests-clar/core/mkdir.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests-clar/core/mkdir.c b/tests-clar/core/mkdir.c index 167639b07..d7723be8d 100644 --- a/tests-clar/core/mkdir.c +++ b/tests-clar/core/mkdir.c @@ -102,8 +102,11 @@ void test_core_mkdir__with_base(void) static void cleanup_chmod_root(void *ref) { mode_t *mode = ref; - if (*mode != 0) + + if (*mode != 0) { (void)p_umask(*mode); + git__free(mode); + } git_futils_rmdir_r("r", GIT_DIRREMOVAL_EMPTY_HIERARCHY); } @@ -111,12 +114,12 @@ static void cleanup_chmod_root(void *ref) void test_core_mkdir__chmods(void) { struct stat st; - mode_t old = 0; + mode_t *old = git__malloc(sizeof(mode_t)); + *old = p_umask(022); - cl_set_cleanup(cleanup_chmod_root, &old); + cl_set_cleanup(cleanup_chmod_root, old); cl_git_pass(git_futils_mkdir("r", NULL, 0777, 0)); - old = p_umask(022); cl_git_pass(git_futils_mkdir("mode/is/important", "r", 0777, GIT_MKDIR_PATH));