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

ICU-4228 memory allocation not using ICU functions

Browse Source 
X-SVN-Rev: 16860
This commit is contained in:
Andy Heninger 2004-11-14 05:11:59 +00:00
parent 74e55898bd
commit 072921d9d3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
icu4c/source/i18n/rbnf.cpp
View File

@ -179,7 +179,7 @@ public:
VArray(Fn_Deleter del) : buf(NULL), cap(0), size(0), deleter(del) {}
~VArray() {
~VArray() {
if (deleter) {
for (int i = 0; i < size; ++i) {
(*deleter)(buf[i]);
@ -898,18 +898,25 @@ RuleBasedNumberFormat::getNumberOfRuleSetDisplayNameLocales(void) const {
Locale
RuleBasedNumberFormat::getRuleSetDisplayNameLocale(int32_t index, UErrorCode& status) const {
if (U_FAILURE(status)) {
return Locale();
}
if (localizations && index >= 0 && index < localizations->getNumberOfDisplayLocales()) {
UnicodeString name(TRUE, localizations->getLocaleName(index), -1);
char buffer[64];
int32_t cap = name.length() + 1;
char* bp = buffer;
if (cap > 64) {
bp = new char[cap];
bp = (char *)uprv_malloc(cap);
if (bp == NULL) {
status = U_MEMORY_ALLOCATION_ERROR;
return Locale();
}
}
name.extract(0, name.length(), bp, cap, UnicodeString::kInvariant);
Locale retLocale(bp);
if (bp != buffer) {
delete[] bp;
uprv_free(bp);
}
return retLocale;
}