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

ICU-20647 Fix TimeZone leak in ucal_open if uloc_setKeywordValue fails.

Browse Source
This commit is contained in:
Jeff Genovy 2019-05-30 22:23:35 -07:00
parent 78f341ce7e
commit e56b19662c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/i18n/ucal.cpp
View File

@ -140,8 +140,8 @@ ucal_open( const UChar* zoneID,
if(U_FAILURE(*status)) return 0;
TimeZone* zone = (zoneID==NULL) ? TimeZone::createDefault()
: _createTimeZone(zoneID, len, status);
LocalPointer<TimeZone> zone( (zoneID==NULL) ? TimeZone::createDefault()
: _createTimeZone(zoneID, len, status), *status);
if (U_FAILURE(*status)) {
return NULL;
@ -157,9 +157,9 @@ ucal_open( const UChar* zoneID,
if (U_FAILURE(*status)) {
return NULL;
}
return (UCalendar*)Calendar::createInstance(zone, Locale(localeBuf), *status);
return (UCalendar*)Calendar::createInstance(zone.orphan(), Locale(localeBuf), *status);
}
return (UCalendar*)Calendar::createInstance(zone, Locale(locale), *status);
return (UCalendar*)Calendar::createInstance(zone.orphan(), Locale(locale), *status);
}
U_CAPI void U_EXPORT2