organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-2851 fix a memory leak

Browse source 
X-SVN-Rev: 11839
This commit is contained in:
Vladimir Weinstein 2003-05-08 18:06:05 +00:00
parent fdc637b53d
commit 351f2820c4
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
icu4c/source/i18n/ucol.cpp
View file

@ -8203,12 +8203,14 @@ ucol_equals(const UCollator *source, const UCollator *target) {
targetResetString = targetParser.source+(targetReset->source & 0xFFFFFF);
targetStringLen = targetReset->source >> 24;
if(sourceStringLen != targetStringLen || (u_strncmp(sourceResetString, targetResetString, sourceStringLen) != 0)) {
return FALSE;
result = FALSE;
goto returnResult;
}
// probably also need to check the expansions
if(sourceReset->expansion) {
if(!targetReset->expansion) {
return FALSE;
result = FALSE;
goto returnResult;
} else {
// compare expansions
sourceResetString = sourceParser.source+(sourceReset->expansion& 0xFFFFFF);
@ -8216,12 +8218,14 @@ ucol_equals(const UCollator *source, const UCollator *target) {
targetResetString = targetParser.source+(targetReset->expansion & 0xFFFFFF);
targetStringLen = targetReset->expansion >> 24;
if(sourceStringLen != targetStringLen || (u_strncmp(sourceResetString, targetResetString, sourceStringLen) != 0)) {
return FALSE;
result = FALSE;
goto returnResult;
}
}
} else {
if(targetReset->expansion) {
return FALSE;
result = FALSE;
goto returnResult;
}
}
sourceReset = sourceReset->next;
@ -8229,7 +8233,8 @@ ucol_equals(const UCollator *source, const UCollator *target) {
}
if(sourceReset != targetReset) { // at least one is not NULL
// there are more tailored elements in one list
return FALSE;
result = FALSE;
goto returnResult;
}
@ -8238,11 +8243,13 @@ ucol_equals(const UCollator *source, const UCollator *target) {
}
// couldn't find the reset anchor, so the collators are not equal
if(j == sourceListLen) {
return FALSE;
result = FALSE;
goto returnResult;
}
}
}
returnResult:
ucol_tok_closeTokenList(&sourceParser);
ucol_tok_closeTokenList(&targetParser);
return result;