Skip to content

Commit e885831

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Fix GH-9309: Segfault when connection is used after imap_close()
2 parents 393577c + 71c22ef commit e885831

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

ext/imap/php_imap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static void imap_object_destroy(zend_object *zobj) {
207207

208208
#define GET_IMAP_STREAM(imap_conn_struct, zval_imap_obj) \
209209
imap_conn_struct = imap_object_from_zend_object(Z_OBJ_P(zval_imap_obj)); \
210-
if (!imap_conn_struct) { \
210+
if (imap_conn_struct->imap_stream == NULL) { \
211211
zend_throw_exception(zend_ce_value_error, "IMAP\\Connection is already closed", 0); \
212212
RETURN_THROWS(); \
213213
}

ext/imap/tests/gh9309.phpt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
--TEST--
2+
Bug GH-9309 (Segfault when connection is used after imap_close())
3+
--EXTENSIONS--
4+
imap
5+
--SKIPIF--
6+
<?php
7+
require_once(__DIR__.'/setup/skipif.inc');
8+
?>
9+
--FILE--
10+
<?php
11+
require_once(__DIR__.'/setup/imap_include.inc');
12+
$stream_id = setup_test_mailbox('gh9309', 0, $mailbox);
13+
imap_close($stream_id);
14+
try {
15+
imap_headers($stream_id);
16+
} catch (ValueError $ex) {
17+
echo $ex->getMessage(), PHP_EOL;
18+
}
19+
?>
20+
--CLEAN--
21+
<?php
22+
$mailbox_suffix = 'gh9309';
23+
require_once(__DIR__.'/setup/clean.inc');
24+
?>
25+
--EXPECT--
26+
Create a temporary mailbox and add 0 msgs
27+
New mailbox created
28+
IMAP\Connection is already closed

0 commit comments

Comments
 (0)