From: Remi Collet <remi@php.net>
Date: Mon, 20 Nov 2017 08:43:06 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~987
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5dbe081efcc840048f2a5f454690621f0676beb;p=php

Merge branch 'PHP-7.2'

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

f5dbe081efcc840048f2a5f454690621f0676beb