Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Fix bug #72910 5.6.27 will be next
10 years ago · 01f4a52aaa
1 changed files with 1 additions and 1 deletions
--- a/ext/mbstring/oniguruma/enc/utf8.c
+++ b/ext/mbstring/oniguruma/enc/utf8.c
@ -98,7 +98,7 @@ mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED)

  len = enclen(ONIG_ENCODING_UTF8, p);
  c = *p++;
-  if (len > 1) {
+  if (len > 1 && p < end) {
    len--;
    n = c & ((1 << (6 - len)) - 1);
    while (len--) {