AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7382 [srl fixing crash] make sure localeName is initialized.

Browse Source 
X-SVN-Rev: 28573
This commit is contained in:
Steven R. Loomis 2010-09-04 01:01:45 +00:00
parent 9ef56a51ab
commit a73ec17054
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/putil.c
View File

@ -1876,6 +1876,7 @@ int_getDefaultCodepage()
const char *localeName = NULL;
const char *name = NULL;
localeName = uprv_getPOSIXIDForDefaultCodepage();
uprv_memset(codesetName, 0, sizeof(codesetName));
#if U_HAVE_NL_LANGINFO_CODESET
/* When available, check nl_langinfo first because it usually gives more
@ -1908,7 +1909,6 @@ int_getDefaultCodepage()
Maybe the application used setlocale already.
*/
uprv_memset(codesetName, 0, sizeof(codesetName));
localeName = uprv_getPOSIXIDForDefaultCodepage();
name = getCodepageFromPOSIXID(localeName, codesetName, sizeof(codesetName));
if (name) {
/* if we can find the codeset name from setlocale, return that. */