com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/cdf.c
| From: | Stanislav Malyshev | Date: | Fri, 15 Aug 2014 00:22:06 +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-79878@lists.php.net to get a copy of this message | ||
Commit: 23122ba69ce628769bd61f7f0aaecdba203fee26
Author: Stanislav Malyshev <stas@php.net> Thu, 14 Aug 2014 17:22:06 -0700
Parents: ed7ab762de586de1dec3d98297b6a464b6dac686 59c2477bc331370105e917db27e82d4e483ab7f0
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=23122ba69ce628769bd61f7f0aaecdba203fee26
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
Bugs:
https://bugs.php.net/67716
Changed paths:
MM ext/fileinfo/libmagic/cdf.c
Diff: