Skip to content

Commit 3139172

Browse files
committed
Merge branch 'PHP-7.1'
* PHP-7.1: Fix bug #73634 - grapheme_strpos illegal memory access Fix typo
2 parents a69136e + 34d6b63 commit 3139172

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/intl/grapheme/grapheme_string.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ PHP_FUNCTION(grapheme_strpos)
110110
size_t haystack_len, needle_len;
111111
const char *found;
112112
zend_long loffset = 0;
113-
int32_t offset = 0, noffset = 0;
113+
int32_t offset = 0;
114+
size_t noffset = 0;
114115
zend_long ret_pos;
115116

116117
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) {

0 commit comments

Comments
 (0)