]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 629e4da d698f0a)
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)
* PHP-5.5:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()

1  2 
ext/phar/util.c patch | diff1 | diff2 | blob | history

diff --cc ext/phar/util.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.