]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41a2f70 e6ad29a)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Mon, 8 Dec 2014 09:24:16 +0000 (12:24 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 8 Dec 2014 09:24:16 +0000 (12:24 +0300)
* PHP-5.5:
  Fixed possible read after end of buffer and use after free.

1  2 
ext/mcrypt/mcrypt.c patch | diff1 | diff2 | blob | history

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