ICU-22696 Avoid unnecessary copies of already NUL terminated strings.

unicode-org · Aug 13, 2024 · bae2aa6 · bae2aa6
1 parent 7220649
commit bae2aa6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/icu4c/source/common/ulocale.cpp b/icu4c/source/common/ulocale.cpp
@@ -21,7 +21,10 @@ U_NAMESPACE_USE
 ULocale*
 ulocale_openForLocaleID(const char* localeID, int32_t length, UErrorCode* err) {
     if (U_FAILURE(*err)) { return nullptr; }
-    CharString str(length < 0 ? StringPiece(localeID) : StringPiece(localeID, length), *err);
+    if (length < 0) {
+        return EXTERNAL(icu::Locale::createFromName(localeID).clone());
+    }
+    CharString str(localeID, length, *err);  // Make a NUL terminated copy.
     if (U_FAILURE(*err)) { return nullptr; }
     return EXTERNAL(icu::Locale::createFromName(str.data()).clone());
 }