]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 27 Apr 2016 06:48:41 +0000 (23:48 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Apr 2016 06:48:41 +0000 (23:48 -0700)
* PHP-5.5:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS

Conflicts:
configure.in
main/php_version.h

1  2 
ext/bcmath/bcmath.c
ext/exif/exif.c
ext/xml/xml.c

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