summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Peter Banyard <girgias@php.net>2020-10-22 17:01:48 +0100
committerGeorge Peter Banyard <girgias@php.net>2020-10-22 17:05:29 +0100
commitba27866aecf086cd8311dd8fa7c9f83e09ec1e82 (patch)
tree116d43b5d68fb3146a9a1f0afa9daebead1c559c
parent20cbb233c4e613ae4b7c669a047ab10dc5080028 (diff)
downloadphp-git-ba27866aecf086cd8311dd8fa7c9f83e09ec1e82.tar.gz
Fix bug 76618
Apply patch which was attached to the bug in July 2018
-rw-r--r--NEWS1
-rw-r--r--ext/imap/php_imap.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ca31fe91d4..c185d60a9b 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ PHP NEWS
fulfilled by traits). (Nikita)
- IMAP:
+ . 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 6861b2ad9e..147df9d4fa 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -867,7 +867,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;
}