ICU-7168 always initialize UErrorCode, and check in at least one place coming in...

X-SVN-Rev: 32268

diff --git a/icu4c/source/common/listformatter.cpp b/icu4c/source/common/listformatter.cpp
index 1daf7b1839126e6ffec2211c39063652dd9bd087..851c1702b0df4de81408ceec2719f237330376f2 100644 (file)
--- a/icu4c/source/common/listformatter.cpp
+++ b/icu4c/source/common/listformatter.cpp
@@ -167,6 +167,9 @@ void ListFormatter::addDataToHash(
 
 const ListFormatData* ListFormatter::getListFormatData(
         const Locale& locale, UErrorCode& errorCode) {
+    if (U_FAILURE(errorCode)) {
+        return NULL;
+    }
     {
         Mutex m(&listFormatterMutex);
         if (listPatternHash == NULL) {
@@ -285,7 +288,7 @@ UnicodeString& ListFormatter::format(const UnicodeString items[], int32_t nItems
  * originalString.
  */
 void ListFormatter::addNewString(const UnicodeString& pat, UnicodeString& originalString,
-    const UnicodeString& nextString, UErrorCode& errorCode) const {
+                                 const UnicodeString& nextString, UErrorCode& errorCode) const {
     if (U_FAILURE(errorCode)) {
         return;
     }

diff --git a/icu4c/source/test/intltest/listformattertest.cpp b/icu4c/source/test/intltest/listformattertest.cpp
index ec7b3cfe4505b532bbc04766052a318ad587c75e..1d5a5a93a70c1c624e705a42a0387018750684ed 100644 (file)
--- a/icu4c/source/test/intltest/listformattertest.cpp
+++ b/icu4c/source/test/intltest/listformattertest.cpp
@@ -69,7 +69,7 @@ void ListFormatterTest::TestLocaleFallback() {
         for(int j = 1; j < 4; ++j) {
             Locale in(testData[i][j-1]);
             Locale out;
-            UErrorCode errorCode;
+            UErrorCode errorCode = U_ZERO_ERROR;
             ListFormatter::getFallbackLocale(in, out, errorCode);
             if (U_FAILURE(errorCode)) {
                 errln("Error in getLocaleFallback: %s", u_errorName(errorCode));