X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85149efad7fc85798de59e8a680616aa5ad85ffb..80a779275ae04443c568dca919adb26cf6f5002c:/src/common/init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index b27736deac..e699699702 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/init.cpp
+// Name:        src/common/init.cpp
 // Purpose:     initialisation for the library
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -20,22 +20,21 @@
 #include "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/debug.h"
     #include "wx/filefn.h"
     #include "wx/log.h"
     #include "wx/thread.h"
     #include "wx/intl.h"
+    #include "wx/module.h"
 #endif
 
 #include "wx/init.h"
 
 #include "wx/ptr_scpd.h"
-#include "wx/module.h"
 #include "wx/except.h"
 
 #if defined(__WXMSW__) && defined(__WXDEBUG__)
@@ -179,7 +178,8 @@ static void ConvertArgsToUnicode(int argc, char **argv)
     gs_initData.argv = new wchar_t *[argc + 1];
     for ( int i = 0; i < argc; i++ )
     {
-        gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
+        wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
+        gs_initData.argv[i] = buf ? wxStrdup(buf) : NULL;
     }
 
     gs_initData.argc = argc;
@@ -216,7 +216,7 @@ static bool DoCommonPreInit()
     // initialization simply disappear under Windows
     //
     // note that we will delete this log target below
-    wxLog::SetActiveTarget(new wxLogBuffer);
+    delete wxLog::SetActiveTarget(new wxLogBuffer);
 #endif // wxUSE_LOG
 
     return true;
@@ -480,4 +480,3 @@ void wxUninitialize()
         wxEntryCleanup();
     }
 }
-