]> 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:36:02 +0000 (14:36 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:36:02 +0000 (14:36 +0200)
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67413  fileinfo: cdf_read_property_info insufficient boundary chec

1  2 
ext/fileinfo/libmagic/cdf.c

Simple merge