]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Tue, 22 Nov 2016 10:28:49 +0000 (13:28 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 22 Nov 2016 10:28:49 +0000 (13:28 +0300)
* PHP-7.0:
  Fixed use after free

1  2 
Zend/zend_ini_parser.y

Simple merge