com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/cdf.c
| From: | Remi Collet | Date: | Tue, 10 Jun 2014 12:16:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/cdf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78801@lists.php.net to get a copy of this message | ||
Commit: 1d6286c049cbe57877f12b17d38d3a55a7f7d36f
Author: Remi Collet <remi@php.net> Tue, 10 Jun 2014 14:16:39 +0200
Parents: 7f8fa470f175fc46941d980b140f98d880200e4d 9d0ca077eea762e9d89523ec33c903525b39e16d
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1d6286c049cbe57877f12b17d38d3a55a7f7d36f
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
Bugs:
https://bugs.php.net/67411
Changed paths:
MM ext/fileinfo/libmagic/cdf.c
Diff: