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

ICU-10043 make an error not a crash when reading import rules fails.

Browse Source 
X-SVN-Rev: 34622
This commit is contained in:
Steven R. Loomis 2013-10-29 20:59:03 +00:00
parent f8729ab14f
commit 7456f5a382
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4c/source/i18n/ucol_tok.cpp
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2001-2012, International Business Machines
* Copyright (C) 2001-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -2256,6 +2256,16 @@ void ucol_tok_initTokenList(
int32_t importRulesLength = 0;
const UChar* importRules = importFunc(context, locale, type, &importRulesLength, status);
if (U_FAILURE(*status) || importRules==NULL) {
/**
* This seems to happen when genrb -R is used (#10043).
* Make this an error, not a crash.
*/
if(U_SUCCESS(*status)) {
*status = U_MISSING_RESOURCE_ERROR;
}
return;
}
#ifdef DEBUG_FOR_COLL_RULES
std::string s;
UnicodeString(importRules).toUTF8String(s);