]> 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:16:39 +0000 (14:16 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:16:39 +0000 (14:16 +0200)
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67411  fileinfo: cdf_check_stream_offset insufficient boundary check

1  2 
ext/fileinfo/libmagic/cdf.c

Simple merge