]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 749f82a 210cfaf)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 18 Mar 2015 05:02:57 +0000 (22:02 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 18 Mar 2015 05:03:24 +0000 (22:03 -0700)
commit225cb973e5e8371b54d174c32f8685fcd2cf4098
tree08b6463063c5f129fd0967b95473c488979b6dd6tree | snapshot
parent749f82af02f4ed0570d5e3a4cf6a1a8f5e9b1514commit | diff
parent210cfafc2b3a1f72f520679b1b302abb8b1a14d0commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

Conflicts:
ext/zip/lib/zip_dirent.c
NEWS diff1 | diff2 | blob | history
ext/zip/lib/zip_dirent.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.