ICU-64252.0.1.tar.gz

[apple/icu.git] / icuSources / test / cintltst / currtest.c

diff --git a/icuSources/test/cintltst/currtest.c b/icuSources/test/cintltst/currtest.c
index 15b30a5a36e36d33e448571c83aa5b3073445f7a..64df6727d07d353e9edf18ea6a2dbb18d9e4ab24 100644 (file)
--- a/icuSources/test/cintltst/currtest.c
+++ b/icuSources/test/cintltst/currtest.c
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 2005-2012, International Business Machines Corporation and
+ * Copyright (c) 2005-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 #include "unicode/utypes.h"
@@ -10,6 +12,7 @@
 #include "unicode/ucurr.h"
 #include "unicode/ustring.h"
 #include "cintltst.h"
+#include "cmemory.h"
 #include "cstring.h"
 
 static void expectInList(const char *isoCurrency, uint32_t currencyType, UBool isExpected) {
@@ -159,7 +162,7 @@ static void TestFractionDigitOverride(void) {
     UNumberFormat *fmt = unum_open(UNUM_CURRENCY, NULL, 0, "hu_HU", NULL, &status);
     UChar buffer[256];
     UChar expectedBuf[256];
-    const char expectedFirst[] = "123\\u00A0Ft";
+    const char expectedFirst[] = "123,46\\u00A0Ft"; /* changed to use 2 fraction digits */
     const char expectedSecond[] = "123,46\\u00A0Ft";
     const char expectedThird[] = "123,456\\u00A0Ft";
     if (U_FAILURE(status)) {
@@ -167,22 +170,22 @@ static void TestFractionDigitOverride(void) {
        return;
     }
     /* Make sure that you can format normal fraction digits. */
-    unum_formatDouble(fmt, 123.456, buffer, sizeof(buffer)/sizeof(buffer[0]), NULL, &status);
-    u_unescape(expectedFirst, expectedBuf, strlen(expectedFirst)+1);
+    unum_formatDouble(fmt, 123.456, buffer, UPRV_LENGTHOF(buffer), NULL, &status);
+    u_unescape(expectedFirst, expectedBuf, (int32_t)strlen(expectedFirst)+1);
     if (u_strcmp(buffer, expectedBuf) != 0) {
        log_err("Error: unum_formatDouble didn't return %s\n", expectedFirst);
     }
     /* Make sure that you can format 2 fraction digits. */
     unum_setAttribute(fmt, UNUM_FRACTION_DIGITS, 2);
-    unum_formatDouble(fmt, 123.456, buffer, sizeof(buffer)/sizeof(buffer[0]), NULL, &status);
-    u_unescape(expectedSecond, expectedBuf, strlen(expectedSecond)+1);
+    unum_formatDouble(fmt, 123.456, buffer, UPRV_LENGTHOF(buffer), NULL, &status);
+    u_unescape(expectedSecond, expectedBuf, (int32_t)strlen(expectedSecond)+1);
     if (u_strcmp(buffer, expectedBuf) != 0) {
        log_err("Error: unum_formatDouble didn't return %s\n", expectedSecond);
     }
     /* Make sure that you can format more fraction digits. */
     unum_setAttribute(fmt, UNUM_FRACTION_DIGITS, 3);
-    unum_formatDouble(fmt, 123.456, buffer, sizeof(buffer)/sizeof(buffer[0]), NULL, &status);
-    u_unescape(expectedThird, expectedBuf, strlen(expectedThird)+1);
+    unum_formatDouble(fmt, 123.456, buffer, UPRV_LENGTHOF(buffer), NULL, &status);
+    u_unescape(expectedThird, expectedBuf, (int32_t)strlen(expectedThird)+1);
     if (u_strcmp(buffer, expectedBuf) != 0) {
        log_err("Error: unum_formatDouble didn't return %s\n", expectedThird);
     }
@@ -244,12 +247,13 @@ static const NumCodeTestEntry NUMCODE_TESTDATA[] = {
 };
 
 static void TestNumericCode(void) {
-    UChar code[4];
+    UChar code[8];  // at least one longer than the longest alphaCode
     int32_t i;
     int32_t numCode;
 
     for (i = 0; NUMCODE_TESTDATA[i].alphaCode; i++) {
-        u_charsToUChars(NUMCODE_TESTDATA[i].alphaCode, code, sizeof(code)/sizeof(code[0]));
+        int32_t length = (int32_t)uprv_strlen(NUMCODE_TESTDATA[i].alphaCode);
+        u_charsToUChars(NUMCODE_TESTDATA[i].alphaCode, code, length + 1);  // +1 includes the NUL
         numCode = ucurr_getNumericCode(code);
         if (numCode != NUMCODE_TESTDATA[i].numericCode) {
             log_data_err("Error: ucurr_getNumericCode returned %d for currency %s, expected - %d\n",