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

ICU-4703 Fix memory leak on function failure

Browse Source 
X-SVN-Rev: 19508
This commit is contained in:
George Rhoten 2006-04-02 09:15:05 +00:00
parent 20a74838a6
commit ee12f37a5c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icu4c/source/common/caniter.cpp
View File

@ -1,6 +1,6 @@
/*
*****************************************************************************
* Copyright (C) 1996-2004, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*****************************************************************************
*/
@ -473,7 +473,6 @@ UnicodeString* CanonicalIterator::getEquivalents(const UnicodeString &segment, i
}
Hashtable *CanonicalIterator::getEquivalents2(const UChar *segment, int32_t segLen, UErrorCode &status) {
//Hashtable *CanonicalIterator::getEquivalents2(const UnicodeString &segment, int32_t segLen, UErrorCode &status) {
Hashtable *result = new Hashtable(status);
/* test for NULL */
@ -500,21 +499,21 @@ Hashtable *CanonicalIterator::getEquivalents2(const UChar *segment, int32_t segL
// see if any character is at the start of some decomposition
UTF_GET_CHAR(segment, 0, i, segLen, cp);
if (!unorm_getCanonStartSet(cp, &starts)) {
continue;
continue;
}
// if so, see which decompositions match
for(j = 0, cp = end+1; cp <= end || uset_getSerializedRange(&starts, j++, &cp, &end); ++cp) {
//Hashtable *remainder = extract(cp, segment, segLen, i, status);
Hashtable *remainder = extract(cp, segment, segLen, i, status);
if (remainder == NULL) continue;
if (remainder == NULL) {
continue;
}
// there were some matches, so add all the possibilities to the set.
UnicodeString prefix(segment, i);
prefix += cp;
const UHashElement *ne = NULL;
int32_t el = -1;
ne = remainder->nextElement(el);
const UHashElement *ne = remainder->nextElement(el);
while (ne != NULL) {
UnicodeString item = *((UnicodeString *)(ne->value.pointer));
UnicodeString *toAdd = new UnicodeString(prefix);
@ -523,7 +522,7 @@ Hashtable *CanonicalIterator::getEquivalents2(const UChar *segment, int32_t segL
status = U_MEMORY_ALLOCATION_ERROR;
delete result;
delete remainder;
return 0;
return NULL;
}
*toAdd += item;
result->put(*toAdd, toAdd, status);
@ -539,7 +538,8 @@ Hashtable *CanonicalIterator::getEquivalents2(const UChar *segment, int32_t segL
/* Test for buffer overflows */
if(U_FAILURE(status)) {
return 0;
delete result;
return NULL;
}
return result;
}