]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0a0f6c495fefdbc4b70751466d0ecb1e8de58dcc
treeec78edc520715936b58768b59ad90492c6ec92fetree | snapshot
parentc12fc77bdfbaa545aaa57b31633bc54a64784842commit | diff
parent951e29f66ec61c21588e10ab202f867f302d572ecommit | diff
Merge branch 'PHP-7.2'

* 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
ext/standard/array.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.