Commit:    8649e4236b12ce9b90356a5804be96bd1f67bcd6
Author:    Antony Dovgal <tony2...@php.net>         Thu, 16 Aug 2012 14:32:55 
+0400
Parents:   3e0b33ed62f329b92eab30e3a97d5bc578e5f855
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=8649e4236b12ce9b90356a5804be96bd1f67bcd6

Log:
Fixed bug #62838

enchant_dict_quick_check() destroys zval, but fails to initialize it

Bugs:
https://bugs.php.net/62838

Changed paths:
  M  NEWS
  M  ext/enchant/enchant.c


Diff:
diff --git a/NEWS b/NEWS
index c7afe53..8da7256 100644
--- 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
index 0126d9e..dcc39e2 100755
--- 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) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to