]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorPierre Joye <pierre.php@gmail.com>
Wed, 8 Jun 2016 04:13:27 +0000 (11:13 +0700)
committerPierre Joye <pierre.php@gmail.com>
Wed, 8 Jun 2016 04:13:27 +0000 (11:13 +0700)
commit4b75cb120dfeb6c3e85536548e92b31badd74254
tree2c0023dc2444e727b6c9107c66d25eb996349a8e
parent10f056255efc741654393c21b234d29333489354
parent6d3fa654b702c8762aa80ab795080f5c4464d677
Merge branch 'PHP-5.6'

* PHP-5.6:
  prevent invalid color index (palette only), may lead to crash
  Add CVE to #66387

Conflicts:
NEWS
ext/gd/libgd/gd.c