Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #77322: PharData::addEmptyDir('/') Possible integer overflow

diff --cc NEWS
index 00052761bdd226e4fecff794262b1dcd4dedeb79,06781af7dbc3fa69c3fac55c2171966e973e4f85..247656ac5eeed2885de72d01c1012ae06191853d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -57,20 -48,6 +57,22 @@@ PH
      query error). (Nikita)
    . Fixed bug #76815 (PDOStatement cannot be GCed/closeCursor-ed when a
      PROCEDURE resultset SIGNAL). (Nikita)
-   . Fixed #75102 (`PharData` says invalid checksum for valid tar). (cmb)
 +  . Fixed bug #79872 (Can't execute query with pending result sets). (Nikita)
 +  . Fixed bug #79131 (PDO does not throw an exception when parameter values are
 +    missing). (Nikita)
 +  . Fixed bug #72368 (PdoStatement->execute() fails but does not throw an
 +    exception). (Nikita)
 +  . Fixed bug #62889 (LOAD DATA INFILE broken). (Nikita)
 +  . Fixed bug #67004 (Executing PDOStatement::fetch() more than once prevents
 +    releasing resultset). (Nikita)
 +  . Fixed bug #79132 (PDO re-uses parameter values from earlier calls to
 +    execute()). (Nikita)
 +
 +- Phar:
 +  . Fixed bug #73809 (Phar Zip parse crash - mmap fail). (cmb)
++  . Fixed bug #75102 (`PharData` says invalid checksum for valid tar). (cmb)
++  . Fixed bug #77322 (PharData::addEmptyDir('/') Possible integer overflow).
++    (cmb)
  
  - Phpdbg:
    . Fixed bug #76813 (Access violation near NULL on source operand). (cmb)

diff --cc ext/phar/util.c
Simple merge