]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 28 Sep 2015 23:59:46 +0000 (16:59 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 28 Sep 2015 23:59:46 +0000 (16:59 -0700)
commitf39a4ee0c971177bc873d282c39ee1b670652f5c
tree03f24006bd5c616b171828a01b4d9da45800f488
parent629e4da7cc8b174acdeab84969cbfc606a019b31
parentd698f0ae51f67c9cce870b09c59df3d6ba959244
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
ext/phar/util.c