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

ICU-22825 Fix memLeak during error in tznames_impl.cpp

Browse source 
Rewrite the TextTrieMap::put() which should delete the value
during error instead of deleting key.
Rewrite to simplified the error handling.
This commit is contained in:
Frank Tang 2024-08-02 02:35:38 -07:00 • committed by Frank Yung-Fong Tang
parent 6de4472db0
commit a22dc93e3a
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
icu4c/source/i18n/tznames_impl.cpp
View file

@ -235,24 +235,18 @@ TextTrieMap::put(const char16_t *key, void *value, UErrorCode &status) {
LocalPointer<UVector> lpLazyContents(new UVector(status), status);
fLazyContents = lpLazyContents.orphan();
}
if (U_FAILURE(status)) {
if (fValueDeleter) {
fValueDeleter((void*) key);
if (U_SUCCESS(status)) {
U_ASSERT(fLazyContents != nullptr);
char16_t *s = const_cast<char16_t *>(key);
fLazyContents->addElement(s, status);
if (U_SUCCESS(status)) {
fLazyContents->addElement(value, status);
return;
}
return;
}
U_ASSERT(fLazyContents != nullptr);
char16_t *s = const_cast<char16_t *>(key);
fLazyContents->addElement(s, status);
if (U_FAILURE(status)) {
if (fValueDeleter) {
fValueDeleter((void*) key);
}
return;
if (fValueDeleter) {
fValueDeleter(value);
}
fLazyContents->addElement(value, status);
}
void