crt: exe: Move calling duplicate_ppstrings(argc, &argv) immediately after filling argc/argv Code inside the block which fills argc/argv is already guarded and prevents duplicate code execution. So move the duplicate_ppstrings() here. Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/crt/crtexe.c b/mingw-w64-crt/crt/crtexe.c index 00221ea..834149b 100644 --- a/mingw-w64-crt/crt/crtexe.c +++ b/mingw-w64-crt/crt/crtexe.c
@@ -215,6 +215,8 @@ if (ret < 0) _amsg_exit (8); /* _RT_SPACEARG */ + duplicate_ppstrings (argc, &argv); + _initterm (__xc_a, __xc_z); __main (); /* C++ initialization. */ @@ -228,7 +230,6 @@ if (__dyn_tls_init_callback != NULL) __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL); - duplicate_ppstrings (argc, &argv); #ifdef _UNICODE __winitenv = envp; #else