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

source/common/simplepatternformatter.cpp

 /*
 ******************************************************************************
-* Copyright (C) 2014, International Business Machines
+* Copyright (C) 2014-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 ******************************************************************************
 * simplepatternformatter.cpp
 */
 #include "simplepatternformatter.h"
 #include "cstring.h"
 #include "uassert.h"
 
 U_NAMESPACE_BEGIN
 
@@ skipping 128 matching lines @@
 SimplePatternFormatter::SimplePatternFormatter(const UnicodeString &pattern) :
         noPlaceholders(),
         placeholders(),
         placeholderSize(0),
         placeholderCount(0),
         firstPlaceholderReused(FALSE) {
     UErrorCode status = U_ZERO_ERROR;
     compile(pattern, status);
 }
 
+SimplePatternFormatter::SimplePatternFormatter(const UnicodeString &pattern,
+        int32_t min, int32_t max,
+        UErrorCode &errorCode)
+        : noPlaceholders(),
+          placeholders(),
+          placeholderSize(0),
+          placeholderCount(0),
+          firstPlaceholderReused(FALSE) {
+    compileMinMaxPlaceholders(pattern, min, max, errorCode);
+}
+
 SimplePatternFormatter::SimplePatternFormatter(
         const SimplePatternFormatter &other) :
         noPlaceholders(other.noPlaceholders),
         placeholders(),
         placeholderSize(0),
         placeholderCount(other.placeholderCount),
         firstPlaceholderReused(other.firstPlaceholderReused) {
     placeholderSize = ensureCapacity(other.placeholderSize);
     uprv_memcpy(
             placeholders.getAlias(),
@@ skipping 13 matching lines @@
     uprv_memcpy(
             placeholders.getAlias(),
             other.placeholders.getAlias(),
             placeholderSize * sizeof(PlaceholderInfo));
     return *this;
 }
 
 SimplePatternFormatter::~SimplePatternFormatter() {
 }
 
-UBool SimplePatternFormatter::compile(
-        const UnicodeString &pattern, UErrorCode &status) {
+UBool SimplePatternFormatter::compileMinMaxPlaceholders(
+        const UnicodeString &pattern,
+        int32_t min, int32_t max,
+        UErrorCode &status) {
     if (U_FAILURE(status)) {
         return FALSE;
     }
     const UChar *patternBuffer = pattern.getBuffer();
     int32_t patternLength = pattern.length();
     UChar *buffer = noPlaceholders.getBuffer(patternLength);
     int32_t len = 0;
     placeholderSize = 0;
     placeholderCount = 0;
     SimplePatternFormatterCompileState state = INIT;
@@ skipping 20 matching lines @@
                 buffer[len++] = 0x27;
                 buffer[len++] = ch;
             }
             state = INIT;
             break;
         case PLACEHOLDER:
             if (ch >= 0x30 && ch <= 0x39) {
                 idBuilder.add(ch);
             } else if (ch == 0x7D && idBuilder.isValid()) {
                 if (!addPlaceholder(idBuilder.getId(), len)) {
+                    noPlaceholders.releaseBuffer(0);
                     status = U_MEMORY_ALLOCATION_ERROR;
                     return FALSE;
                 }
                 state = INIT;
             } else {
                 buffer[len++] = 0x7B;
                 idBuilder.appendTo(buffer, &len);
                 buffer[len++] = ch;
                 state = INIT;
             }
@@ skipping 11 matching lines @@
         break;
     case PLACEHOLDER:
         buffer[len++] = 0X7B;
         idBuilder.appendTo(buffer, &len);
         break;
     default:
         U_ASSERT(false);
         break;
     }
     noPlaceholders.releaseBuffer(len);
+    if (placeholderCount < min || max < placeholderCount) {
+        status = U_ILLEGAL_ARGUMENT_ERROR;
+        return FALSE;
+    }
     return TRUE;
 }
 
 UnicodeString& SimplePatternFormatter::format(
         const UnicodeString &arg0,
         UnicodeString &appendTo,
         UErrorCode &status) const {
     const UnicodeString *params[] = {&arg0};
     return formatAndAppend(
             params,
@@ skipping 243 matching lines @@
         placeholderCount = id + 1;
     }
     if (placeholderSize > 1
             && placeholders[placeholderSize - 1].id == placeholders[0].id) {
         firstPlaceholderReused = TRUE;
     }
     return TRUE;
 }
     
 U_NAMESPACE_END