From: Stanislav Malyshev <stas@php.net>
Date: Mon, 29 Jul 2019 21:51:21 +0000 (-0700)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0beta2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd6874c64d9e1d80b68b1035c1bb962ffd507798;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78338: Array cross-border reading in PCRE
---

fd6874c64d9e1d80b68b1035c1bb962ffd507798
diff --cc ext/pcre/pcre2lib/pcre2_jit_compile.c
index 1f21bfb6ad,c491be2917..283aeff83c
--- a/ext/pcre/pcre2lib/pcre2_jit_compile.c
+++ b/ext/pcre/pcre2lib/pcre2_jit_compile.c
@@@ -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)