From: Remi Collet <remi@php.net>
Date: Mon, 20 Nov 2017 08:42:47 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.13RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d773a92f3c49c3f17079153d7bd9b44462266996;p=php

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
---

d773a92f3c49c3f17079153d7bd9b44462266996