dmitry Fri Jun 17 09:52:58 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard var_unserializer.c var_unserializer.re
/php-src/ext/standard/tests/serialize bug31402.phpt
Log:
Fixed bug #31402 (unserialize creates a field containing a reference when it
should not)
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.18.4.24.2.3&r2=1.18.4.24.2.4&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.18.4.24.2.3
php-src/ext/standard/var_unserializer.c:1.18.4.24.2.4
--- php-src/ext/standard/var_unserializer.c:1.18.4.24.2.3 Mon Jun 13
10:14:39 2005
+++ php-src/ext/standard/var_unserializer.c Fri Jun 17 09:52:55 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.18.4.24.2.3 2005/06/13 14:14:39 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.18.4.24.2.4 2005/06/17 13:52:55 dmitry Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -1017,7 +1017,7 @@
}
*rval = *rval_ref;
(*rval)->refcount++;
- (*rval)->is_ref = 1;
+ (*rval)->is_ref = 0;
return 1;
}
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.11.4.16.2.1&r2=1.11.4.16.2.2&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.11.4.16.2.1
php-src/ext/standard/var_unserializer.re:1.11.4.16.2.2
--- php-src/ext/standard/var_unserializer.re:1.11.4.16.2.1 Mon Jun 13
10:13:11 2005
+++ php-src/ext/standard/var_unserializer.re Fri Jun 17 09:52:55 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.11.4.16.2.1 2005/06/13 14:13:11 derick Exp $ */
+/* $Id: var_unserializer.re,v 1.11.4.16.2.2 2005/06/17 13:52:55 dmitry Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -382,7 +382,7 @@
}
*rval = *rval_ref;
(*rval)->refcount++;
- (*rval)->is_ref = 1;
+ (*rval)->is_ref = 0;
return 1;
}
http://cvs.php.net/diff.php/php-src/ext/standard/tests/serialize/bug31402.phpt?r1=1.1.4.1&r2=1.1.4.1.2.1&ty=u
Index: php-src/ext/standard/tests/serialize/bug31402.phpt
diff -u php-src/ext/standard/tests/serialize/bug31402.phpt:1.1.4.1
php-src/ext/standard/tests/serialize/bug31402.phpt:1.1.4.1.2.1
--- php-src/ext/standard/tests/serialize/bug31402.phpt:1.1.4.1 Tue Jan 18
06:37:37 2005
+++ php-src/ext/standard/tests/serialize/bug31402.phpt Fri Jun 17 09:52:58 2005
@@ -54,7 +54,7 @@
["A"]=>
array(2) {
[1]=>
- &object(x)(1) {
+ object(x)(1) {
["i"]=>
int(1)
}
@@ -65,7 +65,7 @@
}
}
["B"]=>
- &object(x)(1) {
+ object(x)(1) {
["i"]=>
int(1)
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
