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

ICU-7816 time zone infinite loop breaking

Browse source 
X-SVN-Rev: 28298
This commit is contained in:
Andy Heninger 2010-07-12 17:24:09 +00:00
parent 45aa2210aa
commit 037e5ac508
1 changed files with 16 additions and 1 deletions

17
icu4c/source/i18n/basictz.cpp
View file

@ -360,7 +360,14 @@ BasicTimeZone::getTimeZoneRulesAfter(UDate start, InitialTimeZoneRule*& initial,
if (!avail) {
break;
}
time = tzt.getTime();
UDate updatedTime = tzt.getTime();
if (updatedTime == time) {
// Time zones that have been manually initialized with inconsistent transtion rules
// can bring us here. Bail out to prevent an infinite loop.
status = U_INVALID_STATE_ERROR;
goto error;
}
time = updatedTime;
const TimeZoneRule *toRule = tzt.getTo();
for (i = 0; i < ruleCount; i++) {
@ -511,6 +518,14 @@ error:
delete orgRules;
}
if (done != NULL) {
if (filteredRules != NULL) {
while (!filteredRules->isEmpty()) {
r = (TimeZoneRule*)filteredRules->orphanElementAt(0);
delete r;
}
delete filteredRules;
}
delete res_initial;
uprv_free(done);
}