]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Mon, 8 Dec 2014 09:20:01 +0000 (12:20 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 8 Dec 2014 09:20:01 +0000 (12:20 +0300)
commite6ad29ae96caec9353e42d528895bf2bec02a125
treebfa06b2e81d604b86bf1a26a780af93da682abbc
parent5d126245a3bb71b167a3b02a9d874c9247b556ff
parentdd791cd71742fdb9b87b7166537fbb25bd7cd8b9
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed possible read after end of buffer and use after free.
ext/mcrypt/mcrypt.c