]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 29 Mar 2016 11:12:47 +0000 (13:12 +0200)
committerAnatol Belski <ab@php.net>
Tue, 29 Mar 2016 11:12:47 +0000 (13:12 +0200)
* PHP-5.6:
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file


Trivial merge