]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6e3ce4 cf855ed)
Merge branch 'PHP-7.4' into master
authorChristoph M. Becker <cmbecker69@gmx.de>
Mon, 3 Aug 2020 09:15:24 +0000 (11:15 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 3 Aug 2020 09:15:24 +0000 (11:15 +0200)
* PHP-7.4:
  Fix #79877: getimagesize function silently truncates after a null byte
  Fix #79797: Use of freed hash key in the phar_parse_zipfile function
  Fix #79877: getimagesize function silently truncates after a null byte
  Fix #79797: Use of freed hash key in the phar_parse_zipfile function


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.