]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c12fc77 951e29f)
Merge branch 'PHP-7.2'
authorXinchen Hui <laruence@gmail.com>
Tue, 5 Jun 2018 09:16:45 +0000 (17:16 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 5 Jun 2018 09:16:45 +0000 (17:16 +0800)
* PHP-7.2:
  Fixed bug #76410 (SIGV in zend_mm_alloc_small)
  Fix bug #76390 - do not allow invalid strings in range()

Conflicts:
ext/standard/array.c

1  2 
ext/standard/array.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/array.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.