Update ICU to 70.1

1 files changed, 17 insertions, 2 deletions

diff --git a/contrib/libs/icu/i18n/translit.cpp b/contrib/libs/icu/i18n/translit.cpp
index ef44f42aa6..c7d6b51057 100644
--- a/contrib/libs/icu/i18n/translit.cpp
+++ b/contrib/libs/icu/i18n/translit.cpp
@@ -170,6 +170,7 @@ Transliterator* Transliterator::clone() const {
  * Assignment operator.
  */
 Transliterator& Transliterator::operator=(const Transliterator& other) {
+    if (this == &other) { return *this; }  // self-assignment: no-op
     ID = other.ID;
     // NUL-terminate the ID string
     ID.getTerminatedBuffer();
@@ -1092,6 +1093,8 @@ Transliterator::createFromRules(const UnicodeString& ID,
     }
     else {
         UVector transliterators(status);
+        // TODO ICU-21701 missing U_FAILURE check here.
+        //      Error and nullptr checking through this whole block looks suspect.
         int32_t passNumber = 1;
 
         int32_t limit = parser.idBlockVector.size();
@@ -1107,10 +1110,15 @@ Transliterator::createFromRules(const UnicodeString& ID,
                         delete temp;
                         return nullptr;
                     }
-                    if (temp != NULL && typeid(*temp) != typeid(NullTransliterator))
+                    if (temp != NULL && typeid(*temp) != typeid(NullTransliterator)) {
                         transliterators.addElement(temp, status);
-                    else
+                        if (U_FAILURE(status)) {
+                            delete temp;
+                            return nullptr;
+                        }
+                    } else {
                         delete temp;
+                    }
                 }
             }
             if (!parser.dataVector.isEmpty()) {
@@ -1126,6 +1134,13 @@ Transliterator::createFromRules(const UnicodeString& ID,
                     return t;
                 }
                 transliterators.addElement(temprbt, status);
+                if (U_FAILURE(status)) {
+                    delete temprbt;
+                    return t;
+                }
+                // TODO: ICU-21701 the transliterators vector will leak its contents if anything goes wrong.
+                //       Under normal operation, the CompoundTransliterator constructor adopts the
+                //       the contents of the vector.
             }
         }