felipe          Wed Feb 20 22:08:19 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/pcre   php_pcre.c 
    /php-src    NEWS 
  Log:
  Fixed Bug #44191 (preg_grep messes up array index)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.24&r2=1.168.2.9.2.25&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.24 
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.25
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.24  Mon Jan 14 09:46:54 2008
+++ php-src/ext/pcre/php_pcre.c Wed Feb 20 22:08:18 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_pcre.c,v 1.168.2.9.2.24 2008/01/14 09:46:54 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.25 2008/02/20 22:08:18 felipe Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1744,7 +1744,7 @@
                
                zend_hash_move_forward(Z_ARRVAL_P(input));
        }
-       
+       zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
        /* Clean up */
        efree(offsets);
 }
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1086&r2=1.2027.2.547.2.1087&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1086 php-src/NEWS:1.2027.2.547.2.1087
--- php-src/NEWS:1.2027.2.547.2.1086    Wed Feb 20 15:28:37 2008
+++ php-src/NEWS        Wed Feb 20 22:08:18 2008
@@ -11,6 +11,7 @@
 - Upgraded PCRE to version 7.6 (Nuno)
 
 
+- Fixed Bug #44191 (preg_grep messes up array index). (Felipe)
 - Fixed bug #44184 (Double free of loop-variable on exception). (Dmitry)
 - Fixed bug #44171 (Invalid FETCH_COLUMN index does not raise an error). (Ilia)
 - Fixed Bug #44159 (Crash: $pdo->setAttribute(PDO::STATEMENT_ATTR_CLASS, 
NULL)).

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

Reply via email to