Skip to content

Commit 1ec95c3

Browse files
ndosschendossche
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix crashes in enchant when passing null bytes
2 parents 6cbe2ed + 91384e5 commit 1ec95c3

File tree

2 files changed

+81
-11
lines changed

2 files changed

+81
-11
lines changed

‎ext/enchant/enchant.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ PHP_FUNCTION(enchant_broker_set_dict_path)
332332
char *value;
333333
size_t value_len;
334334

335-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ols", &broker, enchant_broker_ce, &dict_type, &value, &value_len) == FAILURE) {
335+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olp", &broker, enchant_broker_ce, &dict_type, &value, &value_len) == FAILURE) {
336336
RETURN_THROWS();
337337
}
338338

@@ -429,7 +429,7 @@ PHP_FUNCTION(enchant_broker_request_dict)
429429
char *tag;
430430
size_t taglen;
431431

432-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &broker, enchant_broker_ce, &tag, &taglen) == FAILURE) {
432+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &broker, enchant_broker_ce, &tag, &taglen) == FAILURE) {
433433
RETURN_THROWS();
434434
}
435435

@@ -523,7 +523,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
523523
size_t taglen;
524524
enchant_broker * pbroker;
525525

526-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &broker, enchant_broker_ce, &tag, &taglen) == FAILURE) {
526+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &broker, enchant_broker_ce, &tag, &taglen) == FAILURE) {
527527
RETURN_THROWS();
528528
}
529529

@@ -548,7 +548,7 @@ PHP_FUNCTION(enchant_broker_set_ordering)
548548
size_t ptaglen;
549549
enchant_broker * pbroker;
550550

551-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss", &broker, enchant_broker_ce, &ptag, &ptaglen, &pordering, &porderinglen) == FAILURE) {
551+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp", &broker, enchant_broker_ce, &ptag, &ptaglen, &pordering, &porderinglen) == FAILURE) {
552552
RETURN_THROWS();
553553
}
554554

@@ -586,7 +586,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
586586
size_t wordlen;
587587
enchant_dict *pdict;
588588

589-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|z", &dict, enchant_dict_ce, &word, &wordlen, &sugg) == FAILURE) {
589+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op|z", &dict, enchant_dict_ce, &word, &wordlen, &sugg) == FAILURE) {
590590
RETURN_THROWS();
591591
}
592592

@@ -631,7 +631,7 @@ PHP_FUNCTION(enchant_dict_check)
631631
size_t wordlen;
632632
enchant_dict *pdict;
633633

634-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
634+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
635635
RETURN_THROWS();
636636
}
637637

@@ -651,7 +651,7 @@ PHP_FUNCTION(enchant_dict_suggest)
651651
enchant_dict *pdict;
652652
size_t n_sugg;
653653

654-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
654+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
655655
RETURN_THROWS();
656656
}
657657

@@ -679,7 +679,7 @@ PHP_FUNCTION(enchant_dict_add)
679679
size_t wordlen;
680680
enchant_dict *pdict;
681681

682-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
682+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
683683
RETURN_THROWS();
684684
}
685685

@@ -697,7 +697,7 @@ PHP_FUNCTION(enchant_dict_add_to_session)
697697
size_t wordlen;
698698
enchant_dict *pdict;
699699

700-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
700+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
701701
RETURN_THROWS();
702702
}
703703

@@ -715,7 +715,7 @@ PHP_FUNCTION(enchant_dict_is_added)
715715
size_t wordlen;
716716
enchant_dict *pdict;
717717

718-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
718+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
719719
RETURN_THROWS();
720720
}
721721

@@ -737,7 +737,7 @@ PHP_FUNCTION(enchant_dict_store_replacement)
737737

738738
enchant_dict *pdict;
739739

740-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss", &dict, enchant_dict_ce, &mis, &mislen, &cor, &corlen) == FAILURE) {
740+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp", &dict, enchant_dict_ce, &mis, &mislen, &cor, &corlen) == FAILURE) {
741741
RETURN_THROWS();
742742
}
743743

‎ext/enchant/tests/null_bytes.phpt‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
--TEST--
2+
null bytes
3+
--EXTENSIONS--
4+
enchant
5+
--SKIPIF--
6+
<?php
7+
$broker = enchant_broker_init();
8+
if (!enchant_broker_list_dicts($broker)) die("skip No broker dicts installed");
9+
?>
10+
--FILE--
11+
<?php
12+
13+
$broker = enchant_broker_init();
14+
$dicts = enchant_broker_list_dicts($broker);
15+
$requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
16+
17+
$two_params_broker = [
18+
"enchant_broker_request_dict",
19+
"enchant_broker_dict_exists",
20+
];
21+
22+
$two_params_dict = [
23+
"enchant_dict_quick_check",
24+
"enchant_dict_check",
25+
"enchant_dict_suggest",
26+
"enchant_dict_add",
27+
"enchant_dict_add_to_session",
28+
"enchant_dict_is_added",
29+
];
30+
31+
foreach ($two_params_broker as $func) {
32+
try {
33+
$func($broker, "foo\0bar");
34+
} catch (ValueError $e) {
35+
echo $e->getMessage(), "\n";
36+
}
37+
}
38+
39+
foreach ($two_params_dict as $func) {
40+
try {
41+
$func($requestDict, "foo\0bar");
42+
} catch (ValueError $e) {
43+
echo $e->getMessage(), "\n";
44+
}
45+
}
46+
47+
try {
48+
var_dump(enchant_broker_set_ordering($broker, "foo\0bar", "foo\0bar"));
49+
} catch (ValueError $e) {
50+
echo $e->getMessage(), "\n";
51+
}
52+
53+
try {
54+
var_dump(enchant_dict_store_replacement($requestDict, "foo\0bar", "foo\0bar"));
55+
} catch (ValueError $e) {
56+
echo $e->getMessage(), "\n";
57+
}
58+
59+
?>
60+
--EXPECT--
61+
enchant_broker_request_dict(): Argument #2 ($tag) must not contain any null bytes
62+
enchant_broker_dict_exists(): Argument #2 ($tag) must not contain any null bytes
63+
enchant_dict_quick_check(): Argument #2 ($word) must not contain any null bytes
64+
enchant_dict_check(): Argument #2 ($word) must not contain any null bytes
65+
enchant_dict_suggest(): Argument #2 ($word) must not contain any null bytes
66+
enchant_dict_add(): Argument #2 ($word) must not contain any null bytes
67+
enchant_dict_add_to_session(): Argument #2 ($word) must not contain any null bytes
68+
enchant_dict_is_added(): Argument #2 ($word) must not contain any null bytes
69+
enchant_broker_set_ordering(): Argument #2 ($tag) must not contain any null bytes
70+
enchant_dict_store_replacement(): Argument #2 ($misspelled) must not contain any null bytes

0 commit comments

Comments
 (0)