com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/phar/util.c
| From: | Stanislav Malyshev | Date: | Mon, 28 Sep 2015 23:59:46 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/phar/util.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89191@lists.php.net to get a copy of this message | ||
Commit: f39a4ee0c971177bc873d282c39ee1b670652f5c
Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 16:59:46 -0700
Parents: 629e4da7cc8b174acdeab84969cbfc606a019b31 d698f0ae51f67c9cce870b09c59df3d6ba959244
Branches: PHP-5.6 PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f39a4ee0c971177bc873d282c39ee1b670652f5c
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
Bugs:
https://bugs.php.net/69720
Changed paths:
MM ext/phar/util.c
Diff: