From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 17 Mar 2021 11:39:06 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fddd0ac5520916b6ea3852b6b0d75b1f7ede8095;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #66783: UAF when appending DOMDocument to element
---

fddd0ac5520916b6ea3852b6b0d75b1f7ede8095
diff --cc NEWS
index fa1bf056eb,0584f6504c..0da6240423
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,16 +1,22 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2021, PHP 7.4.18
 +?? ??? 2021, PHP 8.0.5
  
+ - DOM:
+   . Fixed bug #66783 (UAF when appending DOMDocument to element). (cmb)
+ 
 -01 Apr 2021, PHP 7.4.17
 +- FFI:
 +  . Fixed bug #80847 (CData structs with fields of type struct can't be passed
 +    as C function argument). (Nickolas Daniel da Silva, Dmitry)
 +
 +01 Apr 2021, PHP 8.0.4
  
  - Core:
 -  . Fixed bug #80781 (Error handler that throws ErrorException infinite loop).
 -    (Nikita)
    . Fixed bug #75776 (Flushing streams with compression filter is broken). (cmb)
 +  . Fixed bug #80811 (Function exec without $output but with $restult_code
 +    parameter crashes). (Nikita)
 +  . Fixed bug #80814 (threaded mod_php won't load on FreeBSD: No space
 +    available for static Thread Local Storage). (Dmitry)
  
  - Dba:
    . Fixed bug #80817 (dba_popen() may cause segfault during RSHUTDOWN). (cmb)