Fix bug 76618

Apply patch which was attached to the bug in July 2018
php · Oct 22, 2020 · ba27866 · ba27866
1 parent 20cbb23
commit ba27866
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 	}