]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorStanislav Malyshev <stas@php.net>
Tue, 24 Apr 2018 05:03:33 +0000 (22:03 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 24 Apr 2018 05:03:33 +0000 (22:03 -0700)
* PHP-7.1:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start

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

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