-
Notifications
You must be signed in to change notification settings - Fork 7.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
Merge branch 'PHP-8.4'
* PHP-8.4: Fix crashes in enchant when passing null bytes
Showing
2 changed files
with
81 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| --TEST-- | ||
| null bytes | ||
| --EXTENSIONS-- | ||
| enchant | ||
| --SKIPIF-- | ||
| <?php | ||
| $broker = enchant_broker_init(); | ||
| if (!enchant_broker_list_dicts($broker)) die("skip No broker dicts installed"); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| $broker = enchant_broker_init(); | ||
| $dicts = enchant_broker_list_dicts($broker); | ||
| $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); | ||
|
|
||
| $two_params_broker = [ | ||
| "enchant_broker_request_dict", | ||
| "enchant_broker_dict_exists", | ||
| ]; | ||
|
|
||
| $two_params_dict = [ | ||
| "enchant_dict_quick_check", | ||
| "enchant_dict_check", | ||
| "enchant_dict_suggest", | ||
| "enchant_dict_add", | ||
| "enchant_dict_add_to_session", | ||
| "enchant_dict_is_added", | ||
| ]; | ||
|
|
||
| foreach ($two_params_broker as $func) { | ||
| try { | ||
| $func($broker, "foo\0bar"); | ||
| } catch (ValueError $e) { | ||
| echo $e->getMessage(), "\n"; | ||
| } | ||
| } | ||
|
|
||
| foreach ($two_params_dict as $func) { | ||
| try { | ||
| $func($requestDict, "foo\0bar"); | ||
| } catch (ValueError $e) { | ||
| echo $e->getMessage(), "\n"; | ||
| } | ||
| } | ||
|
|
||
| try { | ||
| var_dump(enchant_broker_set_ordering($broker, "foo\0bar", "foo\0bar")); | ||
| } catch (ValueError $e) { | ||
| echo $e->getMessage(), "\n"; | ||
| } | ||
|
|
||
| try { | ||
| var_dump(enchant_dict_store_replacement($requestDict, "foo\0bar", "foo\0bar")); | ||
| } catch (ValueError $e) { | ||
| echo $e->getMessage(), "\n"; | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| enchant_broker_request_dict(): Argument #2 ($tag) must not contain any null bytes | ||
| enchant_broker_dict_exists(): Argument #2 ($tag) must not contain any null bytes | ||
| enchant_dict_quick_check(): Argument #2 ($word) must not contain any null bytes | ||
| enchant_dict_check(): Argument #2 ($word) must not contain any null bytes | ||
| enchant_dict_suggest(): Argument #2 ($word) must not contain any null bytes | ||
| enchant_dict_add(): Argument #2 ($word) must not contain any null bytes | ||
| enchant_dict_add_to_session(): Argument #2 ($word) must not contain any null bytes | ||
| enchant_dict_is_added(): Argument #2 ($word) must not contain any null bytes | ||
| enchant_broker_set_ordering(): Argument #2 ($tag) must not contain any null bytes | ||
| enchant_dict_store_replacement(): Argument #2 ($misspelled) must not contain any null bytes |