commit 0cfb7a9ca089c76f67465177a2c5e0bab04f95d0
author Sam Lantinga <slouken@libsdl.org> Sat Oct 01 11:48:15 2016 -0700
committer Sam Lantinga <slouken@libsdl.org> Sat Oct 01 11:48:15 2016 -0700
tree 552c681eb3725d081dbb538403032125520c9b17
parent 57e994ed3beef5cba1411c145997610608547783

Fixed bug 3338 - console_wmain doesn't null terminate the argv array

Simon Hug

The function console_wmain in src/main/windows/SDL_windows_main.c does not null terminate the argument list it is creating. As specified by the C standard, "argv[argc] shall be a null pointer."

The SDLTest framework makes use of that null pointer and some test programs can cause an access violation because it's missing.

src/main/windows/SDL_windows_main.c

diff --git a/src/main/windows/SDL_windows_main.c b/src/main/windows/SDL_windows_main.c
index e637808..67ef98e 100644
--- a/src/main/windows/SDL_windows_main.c
+++ b/src/main/windows/SDL_windows_main.c
@@ -141,12 +141,13 @@
 console_wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
 {
     int retval = 0;
-    char **argv = SDL_stack_alloc(char*, argc);
+    char **argv = SDL_stack_alloc(char*, argc + 1);
     int i;
 
     for (i = 0; i < argc; ++i) {
         argv[i] = WIN_StringToUTF8(wargv[i]);
     }
+    argv[argc] = NULL;
 
     retval = main_utf8(argc, argv);