@ Fixed min()/max() segfault. (Andrei)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index f2aa937f992f51657b37f27a657b6d6185e5b986..82b282f1c15bc8924b4d6650ed91be754e02c6c8 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -853,6 +853,7 @@ PHP_FUNCTION(min)
                php_error(E_WARNING, "min: must be passed at least 1 value");
                RETURN_NULL();
        }
+       set_compare_func(SORT_REGULAR);
        if (argc == 1) {
                pval **arr;
 
@@ -904,6 +905,7 @@ PHP_FUNCTION(max)
                php_error(E_WARNING, "max: must be passed at least 1 value");
                RETURN_NULL();
        }
+       set_compare_func(SORT_REGULAR);
        if (argc == 1) {
                pval **arr;
 

diff --git a/ext/standard/levenshtein.c b/ext/standard/levenshtein.c
index 031aee706e600fb9028595b0f52c5778111aba29..2ba8bfeeb8be07d94dfe06bca4dc9e3cc0f8a609 100644 (file)
--- a/ext/standard/levenshtein.c
+++ b/ext/standard/levenshtein.c
@@ -97,7 +97,8 @@ static int calc_levdist(const char *s1, const char *s2) /* faster, but obfuscate
 
 /* {{{ proto int levenshtein(string str1, string str2)
    Calculate Levenshtein distance between two strings */
-PHP_FUNCTION(levenshtein){
+PHP_FUNCTION(levenshtein)
+{
        zval **str1, **str2;
        int l;