ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / rbt_data.cpp

diff --git a/icuSources/i18n/rbt_data.cpp b/icuSources/i18n/rbt_data.cpp
index bec4b48ce806600e7caa7bc0235f0f0f8ba7f443..4b596ac6c4a2b12e228704e45c5db42273d14196 100644 (file)
--- a/icuSources/i18n/rbt_data.cpp
+++ b/icuSources/i18n/rbt_data.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-*   Copyright (C) 1999-2006, International Business Machines
+*   Copyright (C) 1999-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -28,7 +30,7 @@ TransliterationRuleData::TransliterationRuleData(UErrorCode& status)
     if (U_FAILURE(status)) {
         return;
     }
-    variableNames.setValueDeleter(uhash_deleteUnicodeString);
+    variableNames.setValueDeleter(uprv_deleteUObject);
     variables = 0;
     variablesLength = 0;
 }
@@ -40,12 +42,17 @@ TransliterationRuleData::TransliterationRuleData(const TransliterationRuleData&
     variablesLength(other.variablesLength)
 {
     UErrorCode status = U_ZERO_ERROR;
-    variableNames.setValueDeleter(uhash_deleteUnicodeString);
-    int32_t pos = -1;
+    int32_t i = 0;
+    variableNames.setValueDeleter(uprv_deleteUObject);
+    int32_t pos = UHASH_FIRST;
     const UHashElement *e;
     while ((e = other.variableNames.nextElement(pos)) != 0) {
         UnicodeString* value =
             new UnicodeString(*(const UnicodeString*)e->value.pointer);
+        // Exit out if value could not be created.
+        if (value == NULL) {
+               return;
+        }
         variableNames.put(*(UnicodeString*)e->key.pointer, value, status);
     }
 
@@ -57,10 +64,23 @@ TransliterationRuleData::TransliterationRuleData(const TransliterationRuleData&
             status = U_MEMORY_ALLOCATION_ERROR;
             return;
         }
-        for (int32_t i=0; i<variablesLength; ++i) {
+        for (i=0; i<variablesLength; ++i) {
             variables[i] = other.variables[i]->clone();
+            if (variables[i] == NULL) {
+                status = U_MEMORY_ALLOCATION_ERROR;
+                break;
+            }
         }
-    }    
+    }
+    // Remove the array and exit if memory allocation error occured.
+    if (U_FAILURE(status)) {
+        for (int32_t n = i-1; n >= 0; n--) {
+            delete variables[n];
+        }
+        uprv_free(variables);
+        variables = NULL;
+        return;
+    }
 
     // Do this last, _after_ setting up variables[].
     ruleSet.setData(this); // ruleSet must already be frozen