failed conversion shouldn't trigger an assert

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-14 07:05:58 +00:00
parent 20e19923ee
commit 311f2009e6
1 changed files with 2 additions and 1 deletions
--- a/src/osx/core/strconv_cf.cpp
+++ b/src/osx/core/strconv_cf.cpp
@@ -85,7 +85,8 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
                                                false //no BOM/external representation
                                                ));

-        wxCHECK(theString != NULL, wxCONV_FAILED);
+        if ( theString == NULL )
+            return wxCONV_FAILED;

        /* NOTE: The string content includes the NULL element if the source string did
         * That means we have to do nothing special because the destination will have