]> granicus.if.org Git - php/commitdiff
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)
* 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

1  2 
ext/phar/zip.c
ext/standard/image.c

diff --cc ext/phar/zip.c
Simple merge
Simple merge