]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Sat, 25 Oct 2014 09:30:29 +0000 (11:30 +0200)
committerRemi Collet <remi@php.net>
Sat, 25 Oct 2014 09:30:29 +0000 (11:30 +0200)
* PHP-5.5:
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers

1  2 
ext/fileinfo/libmagic/readelf.c

Simple merge