granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cc7631d fe13566)

author	Anatol Belski <ab@php.net>
	Tue, 29 Mar 2016 11:11:17 +0000 (13:11 +0200)
committer	Anatol Belski <ab@php.net>
	Tue, 29 Mar 2016 11:11:17 +0000 (13:11 +0200)
commit	84990ab346d6f44055b8e743cf12421534591023
tree	908abeec3124fbbe2e6005d95aee29fe591a6f4a	tree \| snapshot
parent	cc7631dd083d4e9a4d59772008e747b246a5c8d5	commit \| diff
parent	fe13566c93f118a15a96320a546c7878fd0cfc5e	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file

ext/fileinfo/libmagic/funcs.c

Unnamed repository; edit this file 'description' to name the repository.