com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/softmagic.c
| From: | Anatol Belski | Date: | Sun, 04 Jan 2015 13:23:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83957@lists.php.net to get a copy of this message | ||
Commit: 28e44f9d44501ca18318d31158155313e9226c1a
Author: Anatol Belski <ab@php.net> Sun, 4 Jan 2015 14:23:56 +0100
Parents: c06f66563adaba30f5577add7a4a50bbe24c29e6 d3f171117c6913e849df004a927dd4915c64124c
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28e44f9d44501ca18318d31158155313e9226c1a
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
Bugs:
https://bugs.php.net/68735
Changed paths:
MM ext/fileinfo/libmagic/softmagic.c
Diff: