organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-5170 fix bug in break iterator use of UText, surfaced as failure in string search tests.

Browse source 
X-SVN-Rev: 19593
This commit is contained in:
Andy Heninger 2006-04-26 00:51:53 +00:00
parent 79637baca1
commit 4a1c753cf3
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
icu4c/source/common/ubrk.cpp
View file

@ -1,6 +1,6 @@
/*
*****************************************************************************************
* Copyright (C) 1996-2005, International Business Machines
* Copyright (C) 1996-2006, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@ -168,26 +168,16 @@ ubrk_setText(UBreakIterator* bi,
int32_t textLength,
UErrorCode* status)
{
if (U_FAILURE(*status)) return;
const CharacterIterator& biText = ((BreakIterator*)bi)->getText();
int32_t textLen = (textLength == -1 ? u_strlen(text) : textLength);
if (biText.getDynamicClassID() == UCharCharacterIterator::getStaticClassID()) {
((UCharCharacterIterator&)biText).setText(text, textLen);
}
else {
UCharCharacterIterator *iter = 0;
iter = new UCharCharacterIterator(text, textLen);
if(iter == 0) {
*status = U_MEMORY_ALLOCATION_ERROR;
return;
}
((BreakIterator*)bi)->adoptText(iter);
}
BreakIterator *brit = (BreakIterator *)bi;
UText ut = UTEXT_INITIALIZER;
utext_openUChars(&ut, text, textLength, status);
brit->setText(&ut, *status);
// A stack allocated UText wrapping a UCHar * string
// can be dumped without explicitly closing it.
}
U_DRAFT void U_EXPORT2
ubrk_setUText(UBreakIterator *bi,
UText *text,