organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

ICU-22827 Fix memLeak by using LocalUResourceBundlePointer

Browse source
This commit is contained in:
Frank Tang 2024-08-02 02:56:55 -07:00 • committed by Frank Yung-Fong Tang
parent 2f5a46ffd5
commit 6c8c6aa430
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4c/source/i18n/timezone.cpp
View file

@ -1607,8 +1607,11 @@ TimeZone::getWindowsID(const UnicodeString& id, UnicodeString& winid, UErrorCode
return winid;
}
UResourceBundle *mapTimezones = ures_openDirect(nullptr, "windowsZones", &status);
ures_getByKey(mapTimezones, "mapTimezones", mapTimezones, &status);
LocalUResourceBundlePointer mapTimezones(ures_openDirect(nullptr, "windowsZones", &status));
if (U_FAILURE(status)) {
return winid;
}
ures_getByKey(mapTimezones.getAlias(), "mapTimezones", mapTimezones.getAlias(), &status);
if (U_FAILURE(status)) {
return winid;
@ -1616,8 +1619,8 @@ TimeZone::getWindowsID(const UnicodeString& id, UnicodeString& winid, UErrorCode
UResourceBundle *winzone = nullptr;
UBool found = false;
while (ures_hasNext(mapTimezones) && !found) {
winzone = ures_getNextResource(mapTimezones, winzone, &status);
while (ures_hasNext(mapTimezones.getAlias()) && !found) {
winzone = ures_getNextResource(mapTimezones.getAlias(), winzone, &status);
if (U_FAILURE(status)) {
break;
}
@ -1658,7 +1661,6 @@ TimeZone::getWindowsID(const UnicodeString& id, UnicodeString& winid, UErrorCode
ures_close(regionalData);
}
ures_close(winzone);
ures_close(mapTimezones);
return winid;
}