commit 52989746d90af5f0e240ea9a2fda8a9a1cb043ff
author Andy Heninger <andy.heninger@gmail.com> Thu Dec 01 01:41:40 2016 +0000
committer Andy Heninger <andy.heninger@gmail.com> Thu Dec 01 01:41:40 2016 +0000
tree 5d7b34642448c08896a5f1414cadca909bf6043b
parent a19a3a0f7aec81f785667f88e049082a23ae293a

ICU-12849 Title Casing, incorrect length returned when preflighting with a NULL output buffer.

X-SVN-Rev: 39518

icu4c/source/common/ucasemap.cpp

diff --git a/icu4c/source/common/ucasemap.cpp b/icu4c/source/common/ucasemap.cpp
index 4d59f7d..0576a26 100644
--- a/icu4c/source/common/ucasemap.cpp
+++ b/icu4c/source/common/ucasemap.cpp
@@ -422,6 +422,9 @@
                                 src, &csc,
                                 titleLimit, idx,
                                 pErrorCode);
+                        if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
+                            *pErrorCode=U_ZERO_ERROR;
+                        }
                         if(U_FAILURE(*pErrorCode)) {
                             return destIndex;
                         }

icu4c/source/common/ustrcase.cpp

diff --git a/icu4c/source/common/ustrcase.cpp b/icu4c/source/common/ustrcase.cpp
index aee3536..8f594ec 100644
--- a/icu4c/source/common/ustrcase.cpp
+++ b/icu4c/source/common/ustrcase.cpp
@@ -305,6 +305,9 @@
                                 src, &csc,
                                 titleLimit, idx,
                                 pErrorCode);
+                        if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
+                            *pErrorCode=U_ZERO_ERROR;
+                        }
                         if(U_FAILURE(*pErrorCode)) {
                             return destIndex;
                         }

icu4c/source/test/intltest/strcase.cpp

diff --git a/icu4c/source/test/intltest/strcase.cpp b/icu4c/source/test/intltest/strcase.cpp
index 34f3e4a..7054b7f 100644
--- a/icu4c/source/test/intltest/strcase.cpp
+++ b/icu4c/source/test/intltest/strcase.cpp
@@ -49,6 +49,7 @@
     TESTCASE_AUTO(TestGreekUpper);
     TESTCASE_AUTO(TestLongUpper);
     TESTCASE_AUTO(TestMalformedUTF8);
+    TESTCASE_AUTO(TestBufferOverflow);
     TESTCASE_AUTO_END;
 }
 
@@ -815,3 +816,35 @@
               errorCode.errorName(), (int)destLength, dest[0]);
     }
 }
+
+void StringCaseTest::TestBufferOverflow() {
+    // Ticket #12849, incorrect result from Title Case preflight operation, 
+    // when buffer overflow error is expected.
+    IcuTestErrorCode errorCode(*this, "TestBufferOverflow");
+    LocalUCaseMapPointer csm(ucasemap_open("en", 0, errorCode));
+    if (errorCode.isFailure()) {
+        errln("ucasemap_open(English) failed - %s", errorCode.errorName());
+        return;
+    }
+
+    UnicodeString data("hello world");
+    int32_t result = ucasemap_toTitle(csm.getAlias(), NULL, 0, data.getBuffer(), data.length(), errorCode);
+    if (errorCode.get() != U_BUFFER_OVERFLOW_ERROR || result != data.length()) {
+        errln("%s:%d ucasemap_toTitle(\"hello world\") failed: "
+              "expected (U_BUFFER_OVERFLOW_ERROR, %d), got (%s, %d)",
+              __FILE__, __LINE__, data.length(), errorCode.errorName(), result);
+    }
+    errorCode.reset();
+
+#if U_HAVE_STD_STRING
+    std::string data_utf8;
+    data.toUTF8String(data_utf8);
+    result = ucasemap_utf8ToTitle(csm.getAlias(), NULL, 0, data_utf8.c_str(), data_utf8.length(), errorCode);
+    if (errorCode.get() != U_BUFFER_OVERFLOW_ERROR || result != (int32_t)data_utf8.length()) {
+        errln("%s:%d ucasemap_toTitle(\"hello world\") failed: "
+              "expected (U_BUFFER_OVERFLOW_ERROR, %d), got (%s, %d)",
+              __FILE__, __LINE__, data_utf8.length(), errorCode.errorName(), result);
+    }
+    errorCode.reset();
+#endif  // U_HAVE_STD_STRING
+}

icu4c/source/test/intltest/ustrtest.h

diff --git a/icu4c/source/test/intltest/ustrtest.h b/icu4c/source/test/intltest/ustrtest.h
index ef3f6cf..37b3a88 100644
--- a/icu4c/source/test/intltest/ustrtest.h
+++ b/icu4c/source/test/intltest/ustrtest.h
@@ -112,6 +112,7 @@
     void TestGreekUpper();
     void TestLongUpper();
     void TestMalformedUTF8();
+    void TestBufferOverflow();
 
 private:
     void assertGreekUpper(const char *s, const char *expected);