ICU 56 update step 1

source/i18n/ucurr.cpp

 /*
 **********************************************************************
 * Copyright (c) 2002-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
@@ skipping 989 matching lines @@
     }
 
     // Get maximum currency name count first.
     getCurrencyNameCount(loc, total_currency_name_count, total_currency_symbol_count);
 
     *currencyNames = (CurrencyNameStruct*)uprv_malloc
         (sizeof(CurrencyNameStruct) * (*total_currency_name_count));
     *currencySymbols = (CurrencyNameStruct*)uprv_malloc
         (sizeof(CurrencyNameStruct) * (*total_currency_symbol_count));
 
+    if(currencyNames == NULL || currencySymbols == NULL) {
+      ec = U_MEMORY_ALLOCATION_ERROR;
+    }
+
+    if (U_FAILURE(ec)) return;
+
     const UChar* s = NULL;  // currency name
     char* iso = NULL;  // currency ISO code
 
     *total_currency_name_count = 0;
     *total_currency_symbol_count = 0;
 
     UErrorCode ec3 = U_ZERO_ERROR;
     UErrorCode ec4 = U_ZERO_ERROR;
 
     // Using hash to remove duplicates caused by locale fallback
@@ skipping 147 matching lines @@
     for (int32_t index = 0; index < *total_currency_symbol_count; ++index) {
         printf("index: %d\n", index);
         printf("iso: %s\n", (*currencySymbols)[index].IsoCode);
         char curNameBuf[1024];
         memset(curNameBuf, 0, 1024);
         u_austrncpy(curNameBuf, (*currencySymbols)[index].currencyName, (*currencySymbols)[index].currencyNameLen);
         printf("currencySymbol: %s\n", curNameBuf);
         printf("len: %d\n", (*currencySymbols)[index].currencyNameLen);
     }
 #endif
+    // fail on hashtable errors
+    if (U_FAILURE(ec3)) {
+      ec = ec3;
+      return;
+    }
+    if (U_FAILURE(ec4)) {
+      ec = ec4;
+      return;
+    }
 }
 
 // @param  currencyNames: currency names array
 // @param  indexInCurrencyNames: the index of the character in currency names 
 //         array against which the comparison is done
 // @param  key: input text char to compare against
 // @param  begin(IN/OUT): the begin index of matching range in currency names array
 // @param  end(IN/OUT): the end index of matching range in currency names array.
 static int32_t
 binarySearch(const CurrencyNameStruct* currencyNames, 
@@ skipping 1503 matching lines @@
                 code = tmpCode;
             }
         }
         ures_close(bundle);
     }
     return code;
 }
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof