AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4024 fix new line handling bugs in regexp

Browse Source 
X-SVN-Rev: 16112
This commit is contained in:
Andy Heninger 2004-08-05 00:24:36 +00:00
parent c1b416b405
commit a13646fb43
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
icu4c/source/i18n/rematch.cpp
View File

@ -313,16 +313,27 @@ UBool RegexMatcher::find() {
}
int32_t startPos = fMatchEnd;
if (fMatchStart == fMatchEnd && fMatch) {
// Previous match had zero length. Move start position up one position
// to avoid sending find() into a loop on zero-length matches.
if (startPos == fInput->length()) {
fMatch = FALSE;
return FALSE;
if (fMatch) {
// Save the position of any previous successful match for use by the appendTail()
// functions.
fLastMatchEnd = fMatchEnd;
if (fMatchStart == fMatchEnd) {
// Previous match had zero length. Move start position up one position
// to avoid sending find() into a loop on zero-length matches.
if (startPos == fInput->length()) {
fMatch = FALSE;
return FALSE;
}
startPos = fInput->moveIndex32(startPos, 1);
}
startPos = fInput->moveIndex32(startPos, 1);
}
int32_t inputLen = fInput->length();
// Compute the position in the input string beyond which a match can not begin, because
// the minimum length match would extend past the end of the input.
int32_t testLen = inputLen - fPattern->fMinMatchLen;
if (startPos > testLen) {
fMatch = FALSE;