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

fixed crash in iconv_close() as well

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-19 15:42:07 +00:00
parent 1d63fd6bce
commit 405d8f4657
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/strconv.cpp
View File

@@ -600,10 +600,11 @@ private:
// true if the wide char encoding we use (i.e. ms_wcCharsetName) has // true if the wide char encoding we use (i.e. ms_wcCharsetName) has
// different endian-ness than the native one // different endian-ness than the native one
static bool ms_wcNeedsSwap = FALSE; static bool ms_wcNeedsSwap;
}; };
const char *IC_CharSet::ms_wcCharsetName = NULL; const char *IC_CharSet::ms_wcCharsetName = NULL;
bool IC_CharSet::ms_wcNeedsSwap = FALSE;
IC_CharSet::IC_CharSet(const wxChar *name) IC_CharSet::IC_CharSet(const wxChar *name)
: wxCharacterSet(name) : wxCharacterSet(name)
@@ -678,6 +679,10 @@ IC_CharSet::IC_CharSet(const wxChar *name)
{ {
w2m = iconv_open(wxConvLibc.cWX2MB(name), ms_wcCharsetName); w2m = iconv_open(wxConvLibc.cWX2MB(name), ms_wcCharsetName);
} }
else
{
w2m = (iconv_t)-1;
}
} }
IC_CharSet::~IC_CharSet() IC_CharSet::~IC_CharSet()