From 82f6d876660ba1132d75ccfef5c4301d123ea505 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 3 Nov 2021 12:25:10 -0400 Subject: [PATCH] libsandbox: tweak label/decl code for some compiler settings Looks like gcc is inconsistent in when it chokes on this code: > a label can only be part of a statement and a declaration is not a statement Hoist the decl up to the top of scope to avoid the issue. Bug: https://bugs.gentoo.org/821433 Signed-off-by: Mike Frysinger --- libsandbox/trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libsandbox/trace.c b/libsandbox/trace.c index f3390d99822e..d2899b743048 100644 --- a/libsandbox/trace.c +++ b/libsandbox/trace.c @@ -704,6 +704,8 @@ static char *flatten_args(char *const argv[]) bool trace_possible(const char *filename, char *const argv[], const void *data) { + char *args; + /* If YAMA ptrace_scope is very high, then we can't trace at all. #771360 */ int yama = trace_yama_level(); if (yama >= 2) { @@ -721,7 +723,7 @@ bool trace_possible(const char *filename, char *const argv[], const void *data) } fail: - char *args = flatten_args(argv); + args = flatten_args(argv); sb_eqawarn("Unable to trace static ELF: %s: %s\n", filename, args); free(args); return false; -- 2.33.0