Fix bug 76618

Girgias · Girgias · commit 12a09183b369 · 2020-10-22T17:01:48.000+01:00
Apply patch which was attached to the bug in July 2018
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 #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
@@ -1315,7 +1315,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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1315,7 +1315,7 @@ PHP_FUNCTION(imap_reopen)`
`1315`	`1315`
`1316`	`1316`	`imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, ZSTR_VAL(mailbox), flags);`
`1317`	`1317`	`if (imap_le_struct->imap_stream == NIL) {`
`1318`		`- zend_list_delete(Z_RES_P(streamind));`
	`1318`	`+ zend_list_close(Z_RES_P(streamind));`
`1319`	`1319`	`php_error_docref(NULL, E_WARNING, "Couldn't re-open stream");`
`1320`	`1320`	`RETURN_FALSE;`
`1321`	`1321`	`}`