Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80226: imap_sort() leaks sortpgm memory

Author: cmb69

NEWS

@@ -17,6 +17,7 @@ PHP                                                                        NEWS
     (cmb)
   . Fixed bug #80216 (imap_mail_compose() does not validate types/encodings).
     (cmb)
+  . Fixed bug #80226 (imap_sort() leaks sortpgm memory). (cmb)
 
 - Opcache:
   . Fixed bug #80184 (Complex expression in while / if statements resolves to

ext/imap/php_imap.c

@@ -2742,6 +2742,7 @@ PHP_FUNCTION(imap_sort)
 
 	slst = mail_sort(imap_le_struct->imap_stream, (charset ? ZSTR_VAL(charset) : NIL), spg, mypgm, flags);
 
+	mail_free_sortpgm(&mypgm);
 	if (spg && !(flags & SE_FREE)) {
 		mail_free_searchpgm(&spg);
 	}

ext/imap/tests/bug80226.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #80226 (imap_sort() leaks sortpgm memory)
+--SKIPIF--
+<?php
+require_once(__DIR__.'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(__DIR__.'/imap_include.inc');
+$stream = imap_open($default_mailbox, $username, $password);
+imap_sort($stream, SORTFROM, 0);
+?>
+--EXPECT--