Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guard against errors like in wxStringBase::AllocBeforeWrite code (1123226)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-15 20:00:52 +00:00
parent 85445d3445
commit a4ea2d8dbb
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/corefoundation/cfstring.cpp
View File

@@ -107,6 +107,10 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
encoding = wxLocale::GetSystemEncoding() ; encoding = wxLocale::GetSystemEncoding() ;
#endif #endif
} }
if ( encoding == wxFONTENCODING_SYSTEM )
{
enc = CFStringGetSystemEncoding();
}
switch( encoding) switch( encoding)
{ {
@@ -630,6 +634,8 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding ) void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
{ {
Release() ; Release() ;
if (st.IsEmpty())
return ;
wxString str = st ; wxString str = st ;
wxMacConvertNewlines13To10( &str ) ; wxMacConvertNewlines13To10( &str ) ;