From e99c2870a1ca815c1c94bfec209bda8de4b23a7e Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 3 Dec 2011 21:00:42 -0500 Subject: Fixes #4046 checking offset compared to string length --- mod/search/start.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mod/search') diff --git a/mod/search/start.php b/mod/search/start.php index 73a96dc0a..bb8531e9c 100644 --- a/mod/search/start.php +++ b/mod/search/start.php @@ -107,6 +107,7 @@ function search_get_highlighted_relevant_substrings($haystack, $query, $min_matc $word = elgg_strtolower($word); $count = elgg_substr_count($haystack_lc, $word); $word_len = elgg_strlen($word); + $haystack_len = elgg_strlen($haystack_lc); // find the start positions for the words if ($count > 1) { @@ -117,6 +118,10 @@ function search_get_highlighted_relevant_substrings($haystack, $query, $min_matc $stop = $pos + $word_len + $min_match_context; $lengths[] = $stop - $start; $offset += $pos + $word_len; + + if ($offset >= $haystack_len) { + break; + } } } else { $pos = elgg_strpos($haystack_lc, $word); -- cgit v1.2.3