diff options
| author | Joni Poikelin <joni.poikelin@digia.com> | 2015-01-21 14:55:30 +0200 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@digia.com> | 2015-02-03 09:45:11 +0000 |
| commit | f562244f33dc0e7068cc651ee558597d9597b299 (patch) | |
| tree | 90cfbc1dfdb73f38b5b950110667115c86b704bc | |
| parent | 9718cb330cb479ec6e91f1f10c5ee9097fa2f4fb (diff) | |
Fix argv parameter to main() on Windows
Task-number: QTBUG-44050
Change-Id: I5b7ddec9d66158d8075ab091b01e883520e5414e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | src/winmain/qtmain_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/winmain/qtmain_win.cpp b/src/winmain/qtmain_win.cpp index 778ddee64b..25b79543ba 100644 --- a/src/winmain/qtmain_win.cpp +++ b/src/winmain/qtmain_win.cpp @@ -105,9 +105,10 @@ extern "C" int APIENTRY WinMain(HINSTANCE, HINSTANCE, LPSTR /*cmdParamarg*/, int wchar_t **argvW = CommandLineToArgvW(GetCommandLineW(), &argc); if (!argvW) return -1; - char **argv = new char *[argc]; + char **argv = new char *[argc + 1]; for (int i = 0; i < argc; ++i) argv[i] = wideToMulti(CP_ACP, argvW[i]); + argv[argc] = Q_NULLPTR; LocalFree(argvW); const int exitCode = main(argc, argv); for (int i = 0; i < argc; ++i) |