diff --git a/NEWS b/NEWS index 6273fc3097a..2efb946fded 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,7 @@ PHP NEWS . Fixed bug #72809 (Locale::lookup() wrong result with canonicalize option). (cmb) . Fixed bug #68471 (IntlDateFormatter fails for "GMT+00:00" timezone). (cmb) + . Fixed bug #74264 (grapheme_strrpos() broken for negative offsets). (cmb) - OpenSSL: . Fixed bug #52093 (openssl_csr_sign truncates $serial). (cmb) diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index 55fa009f565..23d48973df3 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -157,16 +157,29 @@ int32_t grapheme_strpos_utf16(char *haystack, size_t haystack_len, char *needle, goto finish; } status = U_ZERO_ERROR; - usearch_setOffset(src, offset_pos, &status); + usearch_setOffset(src, last ? 0 : offset_pos, &status); STRPOS_CHECK_STATUS(status, "Invalid search offset"); } if(last) { - char_pos = usearch_last(src, &status); - if(char_pos < offset_pos) { - /* last one is beyound our start offset */ - char_pos = USEARCH_DONE; + if (offset >= 0) { + char_pos = usearch_last(src, &status); + if(char_pos < offset_pos) { + /* last one is beyond our start offset */ + char_pos = USEARCH_DONE; + } + } else { + /* searching backwards is broken, so we search forwards, albeit it's less efficient */ + int32_t prev_pos = USEARCH_DONE; + do { + char_pos = usearch_next(src, &status); + if (char_pos == USEARCH_DONE || char_pos > offset_pos) { + char_pos = prev_pos; + break; + } + prev_pos = char_pos; + } while(1); } } else { char_pos = usearch_next(src, &status); diff --git a/ext/intl/tests/bug74264.phpt b/ext/intl/tests/bug74264.phpt new file mode 100644 index 00000000000..13826cb4b09 --- /dev/null +++ b/ext/intl/tests/bug74264.phpt @@ -0,0 +1,26 @@ +--TEST-- +Bug #74264 (grapheme_sttrpos() broken for negative offsets) +--SKIPIF-- + +--FILE-- + +--EXPECT-- +bool(false) +bool(false) +int(3) +int(3) +int(4) +int(4) +int(5) +int(5) +int(6) +int(6)