]> granicus.if.org Git - php/commit
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)
commit24ccbb00573445b0df5e940a77e7363ace3c31f3
tree4dc58c4e7abbc3a031118cebb2bf7ca5899a1d55
parente874811221c3bebb94625649d0f726d70a128265
parentd8ad2f4695ebd6dc2d4e668d9baeac1c071791a6
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)
  Partial fix for bug #79029

Conflicts:
ext/xmlwriter/php_xmlwriter.c
ext/libxml/libxml.c