]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc7631d fe13566)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 29 Mar 2016 11:11:17 +0000 (13:11 +0200)
committerAnatol Belski <ab@php.net>
Tue, 29 Mar 2016 11:11:17 +0000 (13:11 +0200)
* PHP-5.5:
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file

1  2 
ext/fileinfo/libmagic/funcs.c patch | diff1 | diff2 | blob | history

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