]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorStanislav Malyshev <stas@php.net>
Mon, 29 Jul 2019 20:20:52 +0000 (13:20 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Jul 2019 20:20:52 +0000 (13:20 -0700)
* PHP-7.3:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)

1  2 
ext/exif/exif.c
ext/phar/phar_object.c

diff --cc ext/exif/exif.c
Simple merge
Simple merge