]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorXinchen Hui <laruence@gmail.com>
Wed, 25 Dec 2019 05:18:23 +0000 (13:18 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 25 Dec 2019 05:18:23 +0000 (13:18 +0800)
* PHP-7.4:
  Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)
  Partial fix for bug #79029

Conflicts:
ext/xmlwriter/php_xmlwriter.c

1  2 
ext/libxml/libxml.c

Simple merge