ensure stack pages bytes set to 0xbe when using valgrind

Author: andrew-taylor

main_wrapper.c

@@ -100,6 +100,9 @@ int __wrap_main(int argc, char *argv[], char *envp[]) {
 		setbuf(stdout, NULL);		   
 		signal(SIGPIPE, SIG_DFL);
 		if (debug) fprintf(stderr, "running __real_main\n");
+#if !__DCC_STACK_USE_AFTER_RETURN__
+		clear_stack();
+#endif
 		return __real_main(argc, argv, envp);
 	}
 
@@ -112,10 +115,10 @@ int __wrap_main(int argc, char *argv[], char *envp[]) {
 		setbuf(valgrind_error_pipe, NULL);			
 		valgrind_error_fd = (int)fileno(valgrind_error_pipe);
 	} else {
+		if (debug) perror("popen failed");
 #if !__DCC_STACK_USE_AFTER_RETURN__
 		clear_stack();
 #endif
-		if (debug) perror("popen failed");
 		return __real_main(argc, argv, envp);
 	}
 	setenvd("DCC_VALGRIND_RUNNING", "1");
@@ -343,7 +346,6 @@ static void _memset_shim(void *p, int byte, size_t size) {
 }
 #endif
 
-
 static void setenvd(char *n, char *v) {
 	setenv(n, v, 1);
 	if (debug) fprintf(stderr, "setenv %s=%s\n", n, v);

tests/expected_output/clang-7.0-x86_64-pc-linux-gnu/uninitialized-array-element-printf--valgrind.txt

@@ -10,6 +10,7 @@ Execution stopped here in main() in tests/run_time/uninitialized-array-element-p
 
 Values when execution stopped:
 
+a =  <deleted-value>
 argc =  <deleted-value>
 a[42] =  <deleted-value>
 a[argc] =  <deleted-value>

tests/expected_output/clang-7.0-x86_64-pc-linux-gnu/uninitialized-array-element-sum--valgrind.txt

@@ -11,6 +11,7 @@ Execution stopped here in main() in tests/run_time/uninitialized-array-element-s
 
 Values when execution stopped:
 
+a =  <deleted-value>
 i =  <deleted-value>
 sum =  <deleted-value>
 a[42] =  <deleted-value>