ICU 56 step 4: Apply post-56 fixes for measure/date format

source/common/listformatter.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2013-2014, International Business Machines
+*   Copyright (C) 2013-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  listformatter.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2012aug27
 *   created by: Umesh P. Nair
@@ skipping 14 matching lines @@
 struct ListFormatInternal : public UMemory {
     SimplePatternFormatter twoPattern;
     SimplePatternFormatter startPattern;
     SimplePatternFormatter middlePattern;
     SimplePatternFormatter endPattern;
 
 ListFormatInternal(
         const UnicodeString& two,
         const UnicodeString& start,
         const UnicodeString& middle,
-        const UnicodeString& end) :
-        twoPattern(two),
-        startPattern(start),
-        middlePattern(middle),
-        endPattern(end) {}
+        const UnicodeString& end,
+        UErrorCode &errorCode) :
+        twoPattern(two, 2, 2, errorCode),
+        startPattern(start, 2, 2, errorCode),
+        middlePattern(middle, 2, 2, errorCode),
+        endPattern(end, 2, 2, errorCode) {}
 
 ListFormatInternal(const ListFormatData &data) :
         twoPattern(data.twoPattern),
         startPattern(data.startPattern),
         middlePattern(data.middlePattern),
         endPattern(data.endPattern) { }
 
 ListFormatInternal(const ListFormatInternal &other) :
     twoPattern(other.twoPattern),
     startPattern(other.startPattern),
@@ skipping 130 matching lines @@
     }
     UnicodeString two, start, middle, end;
     getStringByKey(rb, "2", two, errorCode);
     getStringByKey(rb, "start", start, errorCode);
     getStringByKey(rb, "middle", middle, errorCode);
     getStringByKey(rb, "end", end, errorCode);
     ures_close(rb);
     if (U_FAILURE(errorCode)) {
         return NULL;
     }
-    ListFormatInternal* result = new ListFormatInternal(two, start, middle, end);
+    ListFormatInternal* result = new ListFormatInternal(two, start, middle, end, errorCode);
     if (result == NULL) {
         errorCode = U_MEMORY_ALLOCATION_ERROR;
         return NULL;
     }
+    if (U_FAILURE(errorCode)) {
+        delete result;
+        return NULL;
+    }
     return result;
 }
 
 static void getStringByKey(const UResourceBundle* rb, const char* key, UnicodeString& result, UErrorCode& errorCode) {
     int32_t len;
     const UChar* ustr = ures_getStringByKeyWithFallback(rb, key, &len, &errorCode);
     if (U_FAILURE(errorCode)) {
       return;
     }
     result.setTo(ustr, len);
@@ skipping 146 matching lines @@
     if (U_SUCCESS(errorCode)) {
         if (offset >= 0) {
             offset += appendTo.length();
         }
         appendTo += result;
     }
     return appendTo;
 }
 
 U_NAMESPACE_END