com php-src: Merge branch 'PHP-5.5' into PHP-5.6: 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:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: 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-84213@lists.php.net to get a copy of this message | ||
Commit: e18ec956873d1cc1fcd4647f4a218c25d0f80209
Author: Stanislav Malyshev <stas@php.net> Tue, 20 Jan 2015 10:40:39 -0800
Parents: b5e2661fb6546e17e5f9a6982f052b2dce541860 e2744c51b63d1e7c023f25927d3300d647bd97fe
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e18ec956873d1cc1fcd4647f4a218c25d0f80209
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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:
ext/standard/var_unserializer.c
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: