diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-02 04:20:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-02 04:20:54 +0000 |
| commit | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (patch) | |
| tree | 0bf906e3585c93cbe5ef67a05b4a129e18e3edbd /src/winmain | |
| parent | 6e008cd57955c8029671c4c92250b86767f8ec1f (diff) | |
| parent | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (diff) | |
| download | qtbase-7bc9310a2265e14b6880aa29d96adba6d3d7aed0.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5.0
Diffstat (limited to 'src/winmain')
| -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 e88cecf0b3..2944e07e00 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; |