]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d12624 dd791cd)
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)
* PHP-5.4:
  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.