commit d89c4909f8efdeaf9fb919a133fcc8540855f022
author Jeff Genovy <29107334+jefgen@users.noreply.github.com> Fri Aug 30 20:44:42 2019 -0700
committer Jeff Genovy <29107334+jefgen@users.noreply.github.com> Sat Aug 31 00:30:12 2019 -0700
tree d51eccad1a08ec05c07ad691ccce631f41438d7e
parent 616b3c56473da3f1d85e903b9441d35e838f5b75

ICU-20802 Need to use LocalMemory in uloc_openKeywordList, not LocalPointer

icu4c/source/common/uloc.cpp

diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp
index d58bdfa..6a9bfcf 100644
--- a/icu4c/source/common/uloc.cpp
+++ b/icu4c/source/common/uloc.cpp
@@ -1457,22 +1457,19 @@
 U_CAPI UEnumeration* U_EXPORT2
 uloc_openKeywordList(const char *keywordList, int32_t keywordListSize, UErrorCode* status)
 {
-    LocalPointer<UKeywordsContext> myContext;
-    LocalPointer<UEnumeration> result;
+    LocalMemory<UKeywordsContext> myContext;
+    LocalMemory<UEnumeration> result;
 
     if (U_FAILURE(*status)) {
         return nullptr;
     }
-    result.adoptInsteadAndCheckErrorCode(static_cast<UEnumeration *>(uprv_malloc(sizeof(UEnumeration))), *status);
-    if (U_FAILURE(*status)) {
+    myContext.adoptInstead(static_cast<UKeywordsContext *>(uprv_malloc(sizeof(UKeywordsContext))));
+    result.adoptInstead(static_cast<UEnumeration *>(uprv_malloc(sizeof(UEnumeration))));
+    if (myContext.isNull() || result.isNull()) {
+        *status = U_MEMORY_ALLOCATION_ERROR;
         return nullptr;
     }
     uprv_memcpy(result.getAlias(), &gKeywordsEnum, sizeof(UEnumeration));
-    
-    myContext.adoptInsteadAndCheckErrorCode(static_cast<UKeywordsContext *>(uprv_malloc(sizeof(UKeywordsContext))), *status);
-    if (U_FAILURE(*status)) {
-        return nullptr;
-    }
     myContext->keywords = static_cast<char *>(uprv_malloc(keywordListSize+1));
     if (myContext->keywords == nullptr) {
         *status = U_MEMORY_ALLOCATION_ERROR;