X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/f3c0d7a59d99c2a94c6b8822291f0e42be3773c9..0f5d89e82340278ed3d7d50029f37cab2c41a57e:/icuSources/i18n/currunit.cpp

diff --git a/icuSources/i18n/currunit.cpp b/icuSources/i18n/currunit.cpp
index 19788545..3de6856a 100644
--- a/icuSources/i18n/currunit.cpp
+++ b/icuSources/i18n/currunit.cpp
@@ -16,28 +16,59 @@
 
 #include "unicode/currunit.h"
 #include "unicode/ustring.h"
+#include "cstring.h"
+#include "uinvchar.h"
+
+static constexpr char16_t kDefaultCurrency[] = u"XXX";
 
 U_NAMESPACE_BEGIN
 
 CurrencyUnit::CurrencyUnit(ConstChar16Ptr _isoCode, UErrorCode& ec) {
-    *isoCode = 0;
-    if (U_SUCCESS(ec)) {
-        if (_isoCode != nullptr && u_strlen(_isoCode)==3) {
-            u_strcpy(isoCode, _isoCode);
-            char simpleIsoCode[4];
-            u_UCharsToChars(isoCode, simpleIsoCode, 4);
-            initCurrency(simpleIsoCode);
-        } else {
-            ec = U_ILLEGAL_ARGUMENT_ERROR;
-        }
+    // The constructor always leaves the CurrencyUnit in a valid state (with a 3-character currency code).
+    // Note: in ICU4J Currency.getInstance(), we check string length for 3, but in ICU4C we allow a
+    // non-NUL-terminated string to be passed as an argument, so it is not possible to check length.
+    const char16_t* isoCodeToUse;
+    if (U_FAILURE(ec) || _isoCode == nullptr) {
+        isoCodeToUse = kDefaultCurrency;
+    } else if (!uprv_isInvariantUString(_isoCode, 3)) {
+        // TODO: Perform a more strict ASCII check like in ICU4J isAlpha3Code?
+        isoCodeToUse = kDefaultCurrency;
+        ec = U_INVARIANT_CONVERSION_ERROR;
+    } else {
+        isoCodeToUse = _isoCode;
     }
+    // TODO: Perform uppercasing here like in ICU4J Currency.getInstance()?
+    uprv_memcpy(isoCode, isoCodeToUse, sizeof(UChar) * 3);
+    isoCode[3] = 0;
+    char simpleIsoCode[4];
+    u_UCharsToChars(isoCode, simpleIsoCode, 4);
+    initCurrency(simpleIsoCode);
 }
 
-CurrencyUnit::CurrencyUnit(const CurrencyUnit& other) :
-    MeasureUnit(other) {
+CurrencyUnit::CurrencyUnit(const CurrencyUnit& other) : MeasureUnit(other) {
     u_strcpy(isoCode, other.isoCode);
 }
 
+CurrencyUnit::CurrencyUnit(const MeasureUnit& other, UErrorCode& ec) : MeasureUnit(other) {
+    // Make sure this is a currency.
+    // OK to hard-code the string because we are comparing against another hard-coded string.
+    if (uprv_strcmp("currency", getType()) != 0) {
+        ec = U_ILLEGAL_ARGUMENT_ERROR;
+        isoCode[0] = 0;
+    } else {
+        // Get the ISO Code from the subtype field.
+        u_charsToUChars(getSubtype(), isoCode, 4);
+        isoCode[3] = 0; // make 100% sure it is NUL-terminated
+    }
+}
+
+CurrencyUnit::CurrencyUnit() : MeasureUnit() {
+    u_strcpy(isoCode, kDefaultCurrency);
+    char simpleIsoCode[4];
+    u_UCharsToChars(isoCode, simpleIsoCode, 4);
+    initCurrency(simpleIsoCode);
+}
+
 CurrencyUnit& CurrencyUnit::operator=(const CurrencyUnit& other) {
     if (this == &other) {
         return *this;