Skip to content

Commit 8bee0fb

Browse files
committed
Fix #80213: imap_mail_compose() segfaults on certain $bodies
We have to cater to non-associative arrays where the key may be `NULL`; we just skip these elements. Closes GH-6315.
1 parent 07a4185 commit 8bee0fb

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ PHP NEWS
99
- Calendar:
1010
. Fixed bug #80185 (jdtounix() fails after 2037). (cmb)
1111

12+
- IMAP:
13+
. Fixed bug #80213 (imap_mail_compose() segfaults on certain $bodies). (cmb)
14+
1215
- MySQLnd:
1316
. Fixed bug #80115 (mysqlnd.debug doesn't recognize absolute paths with
1417
slashes). (cmb)

ext/imap/php_imap.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3645,6 +3645,7 @@ PHP_FUNCTION(imap_mail_compose)
36453645
if(Z_TYPE_P(pvalue) == IS_ARRAY) {
36463646
disp_param = tmp_param = NULL;
36473647
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
3648+
if (key == NULL) continue;
36483649
disp_param = mail_newbody_parameter();
36493650
disp_param->attribute = cpystr(ZSTR_VAL(key));
36503651
convert_to_string_ex(disp_data);
@@ -3677,6 +3678,7 @@ PHP_FUNCTION(imap_mail_compose)
36773678
if (Z_TYPE_P(pvalue) == IS_ARRAY) {
36783679
disp_param = tmp_param = NULL;
36793680
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
3681+
if (key == NULL) continue;
36803682
disp_param = mail_newbody_parameter();
36813683
disp_param->attribute = cpystr(ZSTR_VAL(key));
36823684
convert_to_string_ex(disp_data);
@@ -3745,6 +3747,7 @@ PHP_FUNCTION(imap_mail_compose)
37453747
if (Z_TYPE_P(pvalue) == IS_ARRAY) {
37463748
disp_param = tmp_param = NULL;
37473749
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
3750+
if (key == NULL) continue;
37483751
disp_param = mail_newbody_parameter();
37493752
disp_param->attribute = cpystr(ZSTR_VAL(key));
37503753
convert_to_string_ex(disp_data);
@@ -3777,6 +3780,7 @@ PHP_FUNCTION(imap_mail_compose)
37773780
if (Z_TYPE_P(pvalue) == IS_ARRAY) {
37783781
disp_param = tmp_param = NULL;
37793782
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
3783+
if (key == NULL) continue;
37803784
disp_param = mail_newbody_parameter();
37813785
disp_param->attribute = cpystr(ZSTR_VAL(key));
37823786
convert_to_string_ex(disp_data);

ext/imap/tests/bug80213.phpt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--TEST--
2+
Bug #80213 (imap_mail_compose() segfaults on certain $bodies)
3+
--SKIPIF--
4+
<?php
5+
if (!extension_loaded('imap')) die('skip imap extension not available');
6+
?>
7+
--FILE--
8+
<?php
9+
$envelope = [];
10+
$body = [[
11+
'type.parameters' => ['param'],
12+
'disposition' => ['disp'],
13+
], [
14+
'type.parameters' => ['param'],
15+
'disposition' => ['disp'],
16+
]];
17+
imap_mail_compose($envelope, $body);
18+
echo "done\n";
19+
?>
20+
--EXPECT--
21+
done

0 commit comments

Comments
 (0)