diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-18 09:58:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-18 09:58:45 +0200 |
| commit | 20efe759168b809b56489e90bc37b666784c07e6 (patch) | |
| tree | b33a99683e64b3fb3946d41f211677e53ef0f60f /src/winmain/qtmain_win.cpp | |
| parent | 50c41bc8efb52b2b3f2aad66d79167320e9b2b31 (diff) | |
| parent | 189280026f091716dfda91ff652cc20b299683c2 (diff) | |
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Ic1e8b154b43c8d8e3f682c96b074b2b77dbfe2ac
Diffstat (limited to 'src/winmain/qtmain_win.cpp')
| -rw-r--r-- | src/winmain/qtmain_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/winmain/qtmain_win.cpp b/src/winmain/qtmain_win.cpp index 25b79543ba..459ca114a6 100644 --- a/src/winmain/qtmain_win.cpp +++ b/src/winmain/qtmain_win.cpp @@ -111,7 +111,7 @@ extern "C" int APIENTRY WinMain(HINSTANCE, HINSTANCE, LPSTR /*cmdParamarg*/, int argv[argc] = Q_NULLPTR; LocalFree(argvW); const int exitCode = main(argc, argv); - for (int i = 0; i < argc; ++i) + for (int i = 0; i < argc && argv[i]; ++i) delete [] argv[i]; delete [] argv; return exitCode; |