dmitry Tue Jan 29 10:44:54 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array bug43505.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard array.c
Log:
Fixed bug #43505 (Assign by reference bug)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1062&r2=1.2027.2.547.2.1063&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1062 php-src/NEWS:1.2027.2.547.2.1063
--- php-src/NEWS:1.2027.2.547.2.1062 Tue Jan 29 09:30:08 2008
+++ php-src/NEWS Tue Jan 29 10:44:53 2008
@@ -39,6 +39,7 @@
timezone). (Derick)
- Fixed bug #43522 (stream_get_line() eats additional characters). (Felipe,
Ilia, Tony)
+- Fixed bug #43505 (Assign by reference bug). (Dmitry)
- Fixed bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory).
(Chris)
- Fixed bug #43495 (array_merge_recursive() crashes with recursive arrays).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.47&r2=1.308.2.21.2.48&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.47
php-src/ext/standard/array.c:1.308.2.21.2.48
--- php-src/ext/standard/array.c:1.308.2.21.2.47 Mon Jan 14 22:10:08 2008
+++ php-src/ext/standard/array.c Tue Jan 29 10:44:53 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.47 2008/01/14 22:10:08 shire Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.48 2008/01/29 10:44:53 dmitry Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -324,7 +324,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
