]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2' into PHP-7.3
authorStanislav Malyshev <stas@php.net>
Mon, 3 Aug 2020 06:56:37 +0000 (23:56 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 3 Aug 2020 06:56:37 +0000 (23:56 -0700)
commit5b29af5c781980ea48320c612aa38d67bc737e90
tree06e52098ac6b794f9a492f75bcd92982d144ad1f
parent1e0bc6e30f9fb327cd06383c8290a8afab1e484d
parentff577b04c0d250473a0ef46f8e332960fec3ca2c
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #79877: getimagesize function silently truncates after a null byte
  Fix #79797: Use of freed hash key in the phar_parse_zipfile function
ext/phar/zip.c
ext/standard/image.c