From 8fa2cfe2581e2470e7e35abd45134be53afe5465 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 14 Apr 2009 07:04:41 +0000 Subject: [PATCH] failed conversion shouldn't trigger an assert git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/core/strconv_cf.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osx/core/strconv_cf.cpp b/src/osx/core/strconv_cf.cpp index be04c8a881..b4cde0c351 100644 --- 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