]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:24:07 +0000 (14:24 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:24:07 +0000 (14:24 +0200)
* PHP-5.5:
  NEWS
  NEWS
  Bug #67412  fileinfo: cdf_count_chain insufficient boundary check

1  2 
ext/fileinfo/libmagic/cdf.c

Simple merge