]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c3980c 0fbcff1)
Merge branch 'PHP-5.5' into PHP-5.6
authorPierre Joye <pierre.php@gmail.com>
Tue, 19 Jul 2016 06:39:46 +0000 (13:39 +0700)
committerPierre Joye <pierre.php@gmail.com>
Tue, 19 Jul 2016 06:39:46 +0000 (13:39 +0700)
* PHP-5.5:
  fix #72512, invalid read or write for palette image when invalid transparent index is used

1  2 
ext/gd/libgd/gd.c patch | diff1 | diff2 | blob | history
ext/gd/libgd/gd_interpolation.c patch | diff1 | diff2 | blob | history

diff --cc ext/gd/libgd/gd.c
Simple merge
diff --cc ext/gd/libgd/gd_interpolation.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.