]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2019 06:16:09 +0000 (23:16 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2019 06:16:09 +0000 (23:16 -0700)
* PHP-7.2:
  Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
  set version for release

1  2 
ext/mbstring/oniguruma/src/regext.c

Simple merge