cvs: php-src(PHP_5_2) / NEWS /ext/standard array.c

colder Sun May 10 16:45:03 2009 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/standard array.c Log: Fix #48224 (Remove incorrect shuffle) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1496&r2=1.2027.2.547.2.1497&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1496 php-src/NEWS:1.2027.2.547.2.1497 --- php-src/NEWS:1.2027.2.547.2.1496 Sun May 10 15:15:47 2009 +++ php-src/NEWS Sun May 10 16:45:01 2009 @@ -12,6 +12,7 @@ - Fixed segfault on invalid session.save_path. (Hannes) - Fixed leaks in imap when a mail_criteria is used. (Pierre) +- Fixed bug #48224 (Incorrect shuffle in array_rand). (Etienne) - Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe) - Fixed bug #48206 (Iterating over an invalid data structure with RecursiveIteratorIterator leads to a segfault). (Scott) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.65&r2=1.308.2.21.2.66&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21.2.65 php-src/ext/standard/array.c:1.308.2.21.2.66 --- php-src/ext/standard/array.c:1.308.2.21.2.65 Fri Feb 13 22:26:46 2009 +++ php-src/ext/standard/array.c Sun May 10 16:45:01 2009 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.308.2.21.2.65 2009/02/13 22:26:46 andrei Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.66 2009/05/10 16:45:01 colder Exp $ */ #include "php.h" #include "php_ini.h" @@ -4204,10 +4204,6 @@ num_avail--; zend_hash_move_forward_ex(Z_ARRVAL_PP(input), &pos); } - - if (num_req_val == num_avail) { - array_data_shuffle(return_value TSRMLS_CC); - } } /* }}} */