dmitry Tue Jun 21 08:11:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/standard array.c
Log:
Fixed bug #31213 (Sideeffects caused by fix of bug #29493)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.436&r2=1.1760.2.437&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.436 php-src/NEWS:1.1760.2.437
--- php-src/NEWS:1.1760.2.436 Mon Jun 20 08:46:51 2005
+++ php-src/NEWS Tue Jun 21 08:10:59 2005
@@ -130,6 +130,7 @@
serializer). (Dmitry)
- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia)
- Fixed bug #31363 (broken non-blocking flock()). ian at snork dot net
+- Fixed bug #31213 (Sideeffects caused by fix of bug #29493). (Dmitry)
- Fixed bug #30961 (Wrong linenumber in ReflectionClass getStartLine()).
(Dmitry)
- Fixed bug #30889 (Conflict between __get/__set and ++ operator). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.18&r2=1.266.2.19&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.18
php-src/ext/standard/array.c:1.266.2.19
--- php-src/ext/standard/array.c:1.266.2.18 Wed Jun 8 15:54:46 2005
+++ php-src/ext/standard/array.c Tue Jun 21 08:10:59 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.266.2.18 2005/06/08 19:54:46 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.19 2005/06/21 12:10:59 dmitry Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1400,7 +1400,11 @@
*orig_var = *entry;
} else {
- (*entry)->is_ref = 1;
+ if ((*var_array)->refcount > 1)
{
+
SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
+ } else {
+ (*entry)->is_ref = 1;
+ }
zval_add_ref(entry);
zend_hash_update(EG(active_symbol_table), final_name.c, final_name.len+1, (void
**) entry, sizeof(zval *), NULL);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
