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:24:07 +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-78806@lists.php.net to get a copy of this message | ||
Commit: 9ee147e6ff970e317b2743b6679dbaca7c875b65
Author: Remi Collet <remi@php.net> Tue, 10 Jun 2014 14:24:07 +0200
Parents: b999947dcd698852eca474b5306ce18cea63226d 20b03c84ec0d66a017a06f3c1fcbf8ffdf62c1a7
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ee147e6ff970e317b2743b6679dbaca7c875b65
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
Bugs:
https://bugs.php.net/67412
Changed paths:
MM ext/fileinfo/libmagic/cdf.c
Diff: