Fixed bug #62838

tony2001 · tony2001 · commit 8649e4236b12 · 2012-08-16T14:32:55.000+04:00
enchant_dict_quick_check() destroys zval, but fails to initialize it
diff --git a/NEWS b/NEWS
@@ -33,6 +33,10 @@ PHP                                                                        NEWS
   . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
     gives Segmentation fault). (Laruence, Gustavo)
 
+- Enchant:
+  . Fixed bug #62838 (enchant_dict_quick_check() destroys zval, but fails to 
+  initialize it). (Tony, Mateusz Goik).
+
 19 Jul 2012, PHP 5.3.15
 
 - Zend Engine:
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
@@ -729,6 +729,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
 
 	if (sugg) {
 		zval_dtor(sugg);
+		array_init(sugg);
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -742,8 +743,6 @@ PHP_FUNCTION(enchant_dict_quick_check)
 			RETURN_FALSE;
 		}
 
-		array_init(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) {

Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,7 @@ PHP_FUNCTION(enchant_dict_quick_check)`
`729`	`729`
`730`	`730`	`if (sugg) {`
`731`	`731`	`zval_dtor(sugg);`
	`732`	`+ array_init(sugg);`
`732`	`733`	`}`
`733`	`734`
`734`	`735`	`PHP_ENCHANT_GET_DICT;`
`@@ -742,8 +743,6 @@ PHP_FUNCTION(enchant_dict_quick_check)`
`742`	`743`	`RETURN_FALSE;`
`743`	`744`	`}`
`744`	`745`
`745`		`- array_init(sugg);`
`746`		`-`
`747`	`746`	`suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, &n_sugg_st);`
`748`	`747`	`memcpy(&n_sugg, &n_sugg_st, sizeof(n_sugg));`
`749`	`748`	`if (suggs && n_sugg) {`