]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorStanislav Malyshev <stas@php.net>
Mon, 29 Jul 2019 21:51:21 +0000 (14:51 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Jul 2019 21:51:21 +0000 (14:51 -0700)
* PHP-7.3:
  Fix #78338: Array cross-border reading in PCRE

1  2 
ext/pcre/pcre2lib/pcre2_jit_compile.c

index 1f21bfb6ada02282b715163bfc66ba7d55bf5c91,c491be2917de2d6475f9603675002c5bbffe8cf0..283aeff83c3030bda2060dc122ab8756e624b8e6
@@@ -8538,11 -7288,7 +8538,11 @@@ int lgb, rgb, ricount
  PCRE2_SPTR bptr;
  uint32_t c;
  
- GETCHARINC(c, cc);
+ c = *cc++;
 +#if PCRE2_CODE_UNIT_WIDTH == 32
 +if (c >= 0x110000)
 +  return NULL;
 +#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
  lgb = UCD_GRAPHBREAK(c);
  
  while (cc < end_subject)