projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cacf57 4c6f486)
Merge branch 'PHP-7.0'
authorStanislav Malyshev <stas@php.net>
Tue, 29 Sep 2015 03:45:38 +0000 (20:45 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 29 Sep 2015 03:45:38 +0000 (20:45 -0700)
* PHP-7.0:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()

Conflicts:
ext/phar/util.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.