com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/exif/exif.c ext/standard/var_unserializer.c ext/standard/var_unseri alizer.re
| From: | Stanislav Malyshev | Date: | Tue, 20 Jan 2015 18:40:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/exif/exif.c ext/standard/var_unserializer.c ext/standard/var_unseri alizer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84215@lists.php.net to get a copy of this message | ||
Commit: e2744c51b63d1e7c023f25927d3300d647bd97fe
Author: Stanislav Malyshev <stas@php.net> Tue, 20 Jan 2015 10:40:11 -0800
Parents: a40e004553f68fce94dcdcb924d8693e0008e7d5 8825311ce1e9b0c3b627ff32808dd4e0d577c136
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e2744c51b63d1e7c023f25927d3300d647bd97fe
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.38 next
Fix bug #68799: Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
configure.in
main/php_version.h
Bugs:
https://bugs.php.net/68799
https://bugs.php.net/68710
Changed paths:
MM ext/exif/exif.c
MM ext/standard/var_unserializer.c
MM ext/standard/var_unserializer.re
Diff: