From d5e2431884b2c13d39f698bcdeeb27c107443555 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 22 Oct 2020 17:01:48 +0100 Subject: [PATCH] Fix bug 76618 Apply patch which was attached to the bug in July 2018 --- NEWS | 1 + ext/imap/php_imap.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a90a29d0c1a..67e9240fa57 100644 --- 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 #76618 (segfault on imap_reopen). (girgias) . Fixed bug #80239 (imap_rfc822_write_address() leaks memory). (cmb) . Fixed minor regression caused by fixing bug #80220. (cmb) . Fixed bug #80242 (imap_mail_compose() segfaults for multipart with rfc822). diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index c605866ef3b..348909991d1 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1323,7 +1323,7 @@ PHP_FUNCTION(imap_reopen) imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, ZSTR_VAL(mailbox), flags); if (imap_le_struct->imap_stream == NIL) { - zend_list_delete(Z_RES_P(streamind)); + zend_list_close(Z_RES_P(streamind)); php_error_docref(NULL, E_WARNING, "Couldn't re-open stream"); RETURN_FALSE; }