From: Stanislav Malyshev <stas@php.net>
Date: Mon, 3 Aug 2020 06:56:37 +0000 (-0700)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.22RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b29af5c781980ea48320c612aa38d67bc737e90;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #79877: getimagesize function silently truncates after a null byte
  Fix #79797: Use of freed hash key in the phar_parse_zipfile function
---

5b29af5c781980ea48320c612aa38d67bc737e90