From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 6 Apr 2006 12:38:31 +0000 (+0000)
Subject: don't crash if conversion of a command line argument to Unicode fails
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/faa112c4ca49e1f1d9467107d6e54cb9986bd900

don't crash if conversion of a command line argument to Unicode fails


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/init.cpp b/src/common/init.cpp
index b27736deac..d126e10b8d 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -179,7 +179,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;