From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 28 May 2016 08:09:31 +0000 (+0800)
Subject: Merge branch 'fix-72221' of https://github.com/Metabolix/php-src
X-Git-Tag: php-7.1.0alpha1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbe89e2c6e02a11dfd5e1a6b0ebdb2567766b672;p=php

Merge branch 'fix-72221' of https://github.com/Metabolix/php-src

* '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)
---

cbe89e2c6e02a11dfd5e1a6b0ebdb2567766b672