diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-28 15:44:34 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-28 15:44:52 +0100 |
| commit | 0bffee4a35f0aa67de756f77ccbdeec7d8a9ab23 (patch) | |
| tree | e23b8f8b06a4f251e1f9fb34f486e649611bdebc | |
| parent | a7de98fb12770191a71d353a1ebef314300adaa2 (diff) | |
| parent | 6adb885966502f53c69b9aeb0e2cbbeac3d6c65a (diff) | |
| download | php-git-0bffee4a35f0aa67de756f77ccbdeec7d8a9ab23.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79311: enchant_dict_suggest() fails on big endian architecture
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/enchant/enchant.c | 16 |
2 files changed, 10 insertions, 10 deletions
@@ -26,6 +26,10 @@ PHP NEWS cmb) . Fixed bug #79271 (DOMDocumentType::$childNodes is NULL). (cmb) +- Enchant: + . Fixed bug #79311 (enchant_dict_suggest() fails on big endian architecture). + (cmb) + - FPM: . Fixed bug #77653 (operator displayed instead of the real error message). (Jakub Zelenka) diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 1bbbe2e453..6ce9d4b582 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -725,18 +725,16 @@ PHP_FUNCTION(enchant_dict_quick_check) PHP_ENCHANT_GET_DICT; if (enchant_dict_check(pdict->pdict, word, wordlen) > 0) { - int n_sugg; - size_t n_sugg_st; + size_t n_sugg; char **suggs; if (!sugg && ZEND_NUM_ARGS() == 2) { RETURN_FALSE; } - suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, &n_sugg_st); - memcpy(&n_sugg, &n_sugg_st, sizeof(n_sugg)); + suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, &n_sugg); if (suggs && n_sugg) { - int i; + size_t i; for (i = 0; i < n_sugg; i++) { add_next_index_string(sugg, suggs[i]); } @@ -778,8 +776,7 @@ PHP_FUNCTION(enchant_dict_suggest) size_t wordlen; char **suggs; enchant_dict *pdict; - int n_sugg; - size_t n_sugg_st; + size_t n_sugg; if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &dict, &word, &wordlen) == FAILURE) { RETURN_FALSE; @@ -787,10 +784,9 @@ PHP_FUNCTION(enchant_dict_suggest) PHP_ENCHANT_GET_DICT; - suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, &n_sugg_st); - memcpy(&n_sugg, &n_sugg_st, sizeof(n_sugg)); + suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, &n_sugg); if (suggs && n_sugg) { - int i; + size_t i; array_init(return_value); for (i = 0; i < n_sugg; i++) { |