Fix bug 76618

Apply patch which was attached to the bug in July 2018

diff --git a/NEWS b/NEWS
index a90a29d0c1ae5b9ef309633b9131d5e685669f51..67e9240fa57e100a9c6fdc3e22c429f466364615 100644 (file)
--- 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 c605866ef3b0857c58917502e100250f75f7f301..348909991d1b06dea800e14dd303d4088480b716 100644 (file)
--- 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;
        }