]> granicus.if.org Git - php/commitdiff
Merge branch 'fix-72221' of https://github.com/Metabolix/php-src
authorXinchen Hui <laruence@gmail.com>
Sat, 28 May 2016 08:09:31 +0000 (16:09 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 28 May 2016 08:09:31 +0000 (16:09 +0800)
* 'fix-72221' of https://github.com/Metabolix/php-src:
  Test for bug #72221, segfault in zend_memnstr_ex
  Fix bug #72221 (segfault, past-the-end access)


Trivial merge