]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 045e0fc d773a92)
Merge branch 'PHP-7.1' into PHP-7.2
authorRemi Collet <remi@php.net>
Mon, 20 Nov 2017 08:42:58 +0000 (09:42 +0100)
committerRemi Collet <remi@php.net>
Mon, 20 Nov 2017 08:42:58 +0000 (09:42 +0100)
* PHP-7.1:
  Better fix bug #75540 Segfault with libzip 1.3.1 - only 1.3.1 is affected - fix use after free

1  2 
ext/zip/php_zip.c patch | diff1 | diff2 | blob | history

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