clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unaligned memory accesses in enchant (bug #51289)

Browse Source
This commit is contained in:
Raphael Geissert 2010-05-01 23:32:40 +00:00
parent 2b0464c3a9
commit 803869d6ff
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/enchant/enchant.c
View File

@ -728,6 +728,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
if (enchant_dict_check(pdict->pdict, word, wordlen) > 0) {
int n_sugg;
size_t n_sugg_st;
char **suggs;
if (!sugg && ZEND_NUM_ARGS() == 2) {
@ -736,7 +737,8 @@ PHP_FUNCTION(enchant_dict_quick_check)
array_init(sugg);
suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, (size_t *) &n_sugg);
suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, n_sugg_st);
memcpy(&n_sugg, &n_sugg_st, sizeof(n_sugg));
if (suggs && n_sugg) {
int i;
for (i = 0; i < n_sugg; i++) {
@ -781,6 +783,7 @@ PHP_FUNCTION(enchant_dict_suggest)
char **suggs;
enchant_dict *pdict;
int n_sugg;
size_t n_sugg_st;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
RETURN_FALSE;
@ -788,7 +791,8 @@ PHP_FUNCTION(enchant_dict_suggest)
PHP_ENCHANT_GET_DICT;
suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, (size_t *)&n_sugg);
suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, &n_sugg_st);
memcpy(&n_sugg, &n_sugg_st, sizeof(n_sugg));
if (suggs && n_sugg) {
int i;

26
ext/enchant/tests/dict_quick_check.phpt Normal file
View File

@ -0,0 +1,26 @@
--TEST--
enchant_dict_quick_check() basic test
--SKIPIF--
<?php
if(!extension_loaded('enchant')) die('skip, enchant not loader');
$tag = 'en_US';
$r = enchant_broker_init();
if (!enchant_broker_dict_exists($r, $tag))
die('skip, no dictionary for ' . $tag . ' tag');
?>
--FILE--
<?php
$tag = 'en_US';
$r = enchant_broker_init();
$d = enchant_broker_request_dict($r, $tag);
enchant_dict_quick_check($d, 'soong', $suggs);
echo "Elements: " . count($suggs) . "\n";
echo "Done\n";
?>
--EXPECTF--
Elements: %d
Done