diff options
author | Stanislav Malyshev <stas@php.net> | 2015-09-28 16:59:46 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-09-28 16:59:46 -0700 |
commit | f39a4ee0c971177bc873d282c39ee1b670652f5c (patch) | |
tree | 03f24006bd5c616b171828a01b4d9da45800f488 /ext/pcre/php_pcre.c | |
parent | 629e4da7cc8b174acdeab84969cbfc606a019b31 (diff) | |
parent | d698f0ae51f67c9cce870b09c59df3d6ba959244 (diff) | |
download | php-git-f39a4ee0c971177bc873d282c39ee1b670652f5c.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions