X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/729e4ab9bc6618bc3d8a898e575df7f4019e29ca..HEAD:/icuSources/i18n/currunit.cpp

diff --git a/icuSources/i18n/currunit.cpp b/icuSources/i18n/currunit.cpp
index 47cba625..dab6dda5 100644
--- a/icuSources/i18n/currunit.cpp
+++ b/icuSources/i18n/currunit.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-* Copyright (c) 2004-2010, International Business Machines
+* Copyright (c) 2004-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -8,53 +10,112 @@
 * Since: ICU 3.0
 **********************************************************************
 */
-#include <typeinfo>  // for 'typeid' to work
-
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/currunit.h"
 #include "unicode/ustring.h"
+#include "cstring.h"
+#include "uinvchar.h"
+#include "charstr.h"
+
+static constexpr char16_t kDefaultCurrency[] = u"XXX";
+static constexpr char kDefaultCurrency8[] = "XXX";
 
 U_NAMESPACE_BEGIN
 
-CurrencyUnit::CurrencyUnit(const UChar* _isoCode, UErrorCode& ec) {
-    *isoCode = 0;
-    if (U_SUCCESS(ec)) {
-        if (_isoCode && u_strlen(_isoCode)==3) {
-            u_strcpy(isoCode, _isoCode);
-        } else {
-            ec = U_ILLEGAL_ARGUMENT_ERROR;
-        }
+CurrencyUnit::CurrencyUnit(ConstChar16Ptr _isoCode, UErrorCode& ec) {
+    // 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.
+    // However, we allow a NUL-terminated empty string, which should have the same behavior as nullptr.
+    // Consider NUL-terminated strings of length 1 or 2 as invalid.
+    const char16_t* isoCodeToUse;
+    if (U_FAILURE(ec) || _isoCode == nullptr || _isoCode[0] == 0) {
+        isoCodeToUse = kDefaultCurrency;
+    } else if (_isoCode[1] == 0 || _isoCode[2] == 0) {
+        isoCodeToUse = kDefaultCurrency;
+        ec = U_ILLEGAL_ARGUMENT_ERROR;
+    } 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(StringPiece _isoCode, UErrorCode& ec) {
+    // Note: unlike the old constructor, reject empty arguments with an error.
+    char isoCodeBuffer[4];
+    const char* isoCodeToUse;
+    // uprv_memchr checks that the string contains no internal NULs
+    if (_isoCode.length() != 3 || uprv_memchr(_isoCode.data(), 0, 3) != nullptr) {
+        isoCodeToUse = kDefaultCurrency8;
+        ec = U_ILLEGAL_ARGUMENT_ERROR;
+    } else if (!uprv_isInvariantString(_isoCode.data(), 3)) {
+        // TODO: Perform a more strict ASCII check like in ICU4J isAlpha3Code?
+        isoCodeToUse = kDefaultCurrency8;
+        ec = U_INVARIANT_CONVERSION_ERROR;
+    } else {
+        // Have to use isoCodeBuffer to ensure the string is NUL-terminated
+        uprv_strncpy(isoCodeBuffer, _isoCode.data(), 3);
+        isoCodeBuffer[3] = 0;
+        isoCodeToUse = isoCodeBuffer;
+    }
+    // TODO: Perform uppercasing here like in ICU4J Currency.getInstance()?
+    u_charsToUChars(isoCodeToUse, isoCode, 3);
+    isoCode[3] = 0;
+    initCurrency(isoCodeToUse);
+}
+
+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(const CurrencyUnit& other) :
-    MeasureUnit(other) {
-    *this = other;
+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) {
-        u_strcpy(isoCode, other.isoCode);
+    if (this == &other) {
+        return *this;
     }
+    MeasureUnit::operator=(other);
+    u_strcpy(isoCode, other.isoCode);
     return *this;
 }
 
-UObject* CurrencyUnit::clone() const {
+CurrencyUnit* CurrencyUnit::clone() const {
     return new CurrencyUnit(*this);
 }
 
 CurrencyUnit::~CurrencyUnit() {
 }
     
-UBool CurrencyUnit::operator==(const UObject& other) const {
-    const CurrencyUnit& c = (const CurrencyUnit&) other;
-    return typeid(*this) == typeid(other) &&
-        u_strcmp(isoCode, c.isoCode) == 0;    
-}
-
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CurrencyUnit)
 
 U_NAMESPACE_END