granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 50a867e 702ef27)

author	Remi Collet <remi@php.net>
	Mon, 20 Nov 2017 08:42:47 +0000 (09:42 +0100)
committer	Remi Collet <remi@php.net>
	Mon, 20 Nov 2017 08:42:47 +0000 (09:42 +0100)
commit	d773a92f3c49c3f17079153d7bd9b44462266996
tree	f800b2e7d114cf297166b952860a68096c1ccba2	tree \| snapshot
parent	50a867eb07c1fa82e113837422d55c2341b53719	commit \| diff
parent	702ef2736479af85ce17aec83c6cfc1fecccf326	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Better fix bug #75540 Segfault with libzip 1.3.1 - only 1.3.1 is affected - fix use after free

ext/zip/php_zip.c

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