From ccc349d3abb70ef38cd2b7706da51b060a385908 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Sat, 9 Mar 2013 18:47:29 +0100 Subject: regex: don't loop 10000 identical matches to find a single $ anchor Change-Id: Ic130ecc4b0b6d58ba7ef063040bd9a11a90db425 --- i18npool/source/search/textsearch.cxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'i18npool') diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 14ecdcc1059d..997b01dd6afa 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -752,6 +752,11 @@ SearchResult TextSearch::RESrchFrwrd( const OUString& searchStr, int nEndOfs = pRegexMatcher->end( nIcuErr); if( nStartOfs < nEndOfs) break; + // If the zero-length match is behind the string, do not match it again + // and again until startPos reaches there. A match behind the string is + // a "$" anchor. + if (nStartOfs == endPos) + break; // try at next position if there was a zero-length match if( ++startPos >= endPos) return aRet; -- cgit