dmitry Tue Jan 29 10:45:07 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array bug43505.phpt
Modified files:
/php-src/ext/standard array.c
Log:
Fixed bug #43505 (Assign by reference bug)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.18&r2=1.308.2.21.2.37.2.19&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.18
php-src/ext/standard/array.c:1.308.2.21.2.37.2.19
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.18 Tue Jan 29 00:39:46 2008
+++ php-src/ext/standard/array.c Tue Jan 29 10:45:06 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.18 2008/01/29 00:39:46 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.19 2008/01/29 10:45:06 dmitry Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -318,7 +318,7 @@
if (Z_OBJ_HT_P(array)->get_class_entry &&
instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(&array, NULL,
NULL, "count", &retval);
if (retval) {
- convert_to_long(retval);
+ convert_to_long_ex(&retval);
RETVAL_LONG(Z_LVAL_P(retval));
zval_ptr_dtor(&retval);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug43505.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/array/bug43505.phpt
+++ php-src/ext/standard/tests/array/bug43505.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
