<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ed8c15b1c8e4d61eebf722c9c45bb96895c53afe">https://github.com/macports/macports-ports/commit/ed8c15b1c8e4d61eebf722c9c45bb96895c53afe</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ed8c15b1c8e4d61eebf722c9c45bb96895c53afe
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon May 22 01:39:06 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> icu: Address CVE-2017-7867 and CVE-2017-7868
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54004
</span>---
devel/icu/Portfile | 8 ++
devel/icu/files/CVE-2017-7867-CVE-2017-7868.patch | 153 ++++++++++++++++++++++
2 files changed, 161 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b8bd286..43121c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,7 @@ configure.args --disable-layoutex \
</span> --enable-static
subport ${name}-docs {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> conflicts ${name}-doxygen-docs
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +64,7 @@ subport ${name}-docs {
</span> }
subport ${name}-doxygen-docs {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> conflicts ${name}-docs
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +78,7 @@ subport ${name}-doxygen-docs {
</span> }
subport ${name}-lx {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> # http://userguide.icu-project.org/layoutengine/paragraph
description ICU paragraph layout library
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,12 +92,17 @@ subport ${name}-lx {
</span> destroot.dir ${worksrcpath}/layoutex
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${subport} ne "${name}-docs" } {
if { ${supported_archs} ne "noarch" } {
PortGroup muniversal 1.0
}
patchfiles-append patch-config-mh-darwin.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append CVE-2017-7867-CVE-2017-7868.patch
</span>
# ICU has three mechanisms to aid other projects in building properly
# 1) .pc files for pkg-config
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/CVE-2017-7867-CVE-2017-7868.patch b/devel/icu/files/CVE-2017-7867-CVE-2017-7868.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4e077ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/files/CVE-2017-7867-CVE-2017-7868.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,153 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://nvd.nist.gov/vuln/detail/CVE-2017-7867
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://nvd.nist.gov/vuln/detail/CVE-2017-7868
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.icu-project.org/trac/ticket/12888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.icu-project.org/trac/changeset/39671
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/utext.cpp (revision 39670)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/utext.cpp (revision 39671)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -848,7 +848,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Chunk size.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Must be less than 85, because of byte mapping from UChar indexes to native indexes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Worst case is three native bytes to one UChar. (Supplemenaries are 4 native bytes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// to two UChars.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Must be less than 42 (256/6), because of byte mapping from UChar indexes to native indexes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Worst case there are six UTF-8 bytes per UChar.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// obsolete 6 byte form fd + 5 trails maps to fffd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// obsolete 5 byte form fc + 4 trails maps to fffd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// non-shortest 4 byte forms maps to fffd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// mapToUChars array size must allow for the worst case, 6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// This could be brought down to 4, by treating fd and fc as pure illegal,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum { UTF8_TEXT_CHUNK_SIZE=32 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -890,5 +896,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // one for a supplementary starting in the last normal position,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // and one for an entry for the buffer limit position.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // correspoding offset in filled part of buf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t align;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1033,4 +1039,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u8b = (UTF8Buf *)ut->p; // the current buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapIndex = ix - u8b->toUCharsMapStart;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1299,4 +1306,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If index is at the end, there is no character there to look at.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ix != ut->b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Note: this function will only move the index back if it is on a trail byte
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // and there is a preceding lead byte and the sequence from the lead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // through this trail could be part of a valid UTF-8 sequence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Otherwise the index remains unchanged.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ U8_SET_CP_START(s8, 0, ix);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1312,5 +1323,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *mapToNative = u8b->mapToNative;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *mapToUChars = u8b->mapToUChars;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int32_t toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Note that toUCharsMapStart can be negative. Happens when the remaining
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // text from current position to the beginning is less than the buffer size.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t destIx = UTF8_TEXT_CHUNK_SIZE+2; // Start in the overflow region
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // at end of buffer to leave room
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1339,4 +1353,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Special case ASCII range for speed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf[destIx] = (UChar)c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(toUCharsMapStart <= srcIx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1368,4 +1383,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (sIx >= srcIx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(toUCharsMapStart <= (srcIx+1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Set native indexing limit to be the current position.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1542,4 +1558,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ U_ASSERT(index<=ut->chunkNativeLimit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t mapIndex = index - u8b->toUCharsMapStart;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ U_ASSERT(offset>=0 && offset<=ut->chunkLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/intltest/utxttest.cpp (revision 39670)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/intltest/utxttest.cpp (revision 39671)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,4 +68,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 7: name = "Ticket12130";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (exec) Ticket12130(); break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 8: name = "Ticket12888";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (exec) Ticket12888(); break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default: name = ""; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,2 +1586,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utext_close(&ut);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// six byte utf-8 forms. Original implementation had an assumption that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// there would be at most three utf-8 bytes per UTF-16 code unit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// The five and six byte sequences map to a single replacement character.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void UTextTest::Ticket12888() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *badString =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UErrorCode status = U_ZERO_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TEST_SUCCESS(status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (;;) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UChar32 c = utext_next32(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (c == U_SENTINEL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t endIdx = utext_getNativeIndex(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (endIdx != (int32_t)strlen(badString)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int32_t prevIndex = endIdx; prevIndex>0;) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UChar32 c = utext_previous32(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t currentIndex = utext_getNativeIndex(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (c != 0xfffd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __FILE__, __LINE__, 0xfffd, c, currentIndex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (currentIndex != prevIndex - 6) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errln("%s:%d: wrong index. Expected, actual = %d, %d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __FILE__, __LINE__, prevIndex - 6, currentIndex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prevIndex = currentIndex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/intltest/utxttest.h (revision 39670)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/intltest/utxttest.h (revision 39671)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,4 +39,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Ticket10983();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Ticket12130();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void Ticket12888();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span></pre><pre style='margin:0'>
</pre>