From 6b8ffbf97b9a5716c6d58758391adc8524c7d7fc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 18 May 2025 14:49:47 +0200 Subject: [PATCH] toolchain/toolchain-wrapper.c: slightly simplify cmdline copying C99 section 5.1.2.2.1p2 mandates that: - argv[argc] shall be a null pointer. https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf So we might as well copy the null pointer along in the memcpy() rather than copy everything up to the null pointer and then add one afterwards for simplicity. Signed-off-by: Peter Korsgaard Signed-off-by: Julien Olivain --- toolchain/toolchain-wrapper.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 703d2fc042..d0bf124926 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -503,12 +503,8 @@ int main(int argc, char **argv) #endif } - /* append forward args */ - memcpy(cur, &argv[1], sizeof(char *) * (argc - 1)); - cur += argc - 1; - - /* finish with NULL termination */ - *cur = NULL; + /* append forward args and terminating NULL */ + memcpy(cur, &argv[1], sizeof(char *) * argc); exec_args = args; #ifdef BR_CCACHE