Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit 7899ac4c14b6 · 2020-10-15T12:56:02.000+02:00
* PHP-7.3:
  Fix #80239: imap_rfc822_write_address() leaks memory
diff --git a/NEWS b/NEWS
@@ -4,6 +4,7 @@ PHP                                                                        NEWS
 
 - IMAP:
   . Fixed bug #64076 (imap_sort() does not return FALSE on failure). (cmb)
+  . Fixed bug #80239 (imap_rfc822_write_address() leaks memory). (cmb)
 
 29 Oct 2020, PHP 7.4.12
 
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -2321,6 +2321,7 @@ PHP_FUNCTION(imap_subscribe)
 	} else {
 		RETURN_FALSE;
 	}
+	mail_free_address(&addr);
 }
 /* }}} */
 
diff --git a/ext/imap/tests/imap_rfc822_write_address_basic.phpt b/ext/imap/tests/imap_rfc822_write_address_basic.phpt
@@ -0,0 +1,12 @@
+--TEST--
+imap_rfc822_write_address() : basic functionality
+--SKIPIF--
+<?php
+if (!extension_loaded('imap')) die('skip imap extension not available');
+?>
+--FILE--
+<?php
+var_dump(imap_rfc822_write_address('me', 'example.com', 'My Name'));
+?>
+--EXPECT--
+string(24) "My Name <me@example.com>"
