cvs: php-src /ext/standard var.c
| From: | Moriyoshi Koizumi | Date: | Tue, 04 Nov 2003 16:08:17 +0000 |
| Subject: | cvs: php-src /ext/standard var.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24428@lists.php.net to get a copy of this message | ||
moriyoshi Tue Nov 4 11:08:17 2003 EDT
Modified files:
/php-src/ext/standard var.c
Log:
Fixed bug #24394 (serializing cross-referenced objects causes segfault)
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.174 php-src/ext/standard/var.c:1.175
--- php-src/ext/standard/var.c:1.174 Tue Oct 7 21:51:32 2003
+++ php-src/ext/standard/var.c Tue Nov 4 11:08:10 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.174 2003/10/08 01:51:32 moriyoshi Exp $ */
+/* $Id: var.c,v 1.175 2003/11/04 16:08:10 moriyoshi Exp $ */
/* {{{ includes
@@ -513,7 +513,7 @@
if(var_hash
&& php_add_var_hash(var_hash, *struc, (void *) &var_already) == FAILURE
- && (*struc)->is_ref) {
+ && ((*struc)->is_ref || Z_TYPE_PP(struc) == IS_OBJECT)) {
smart_str_appendl(buf, "R:", 2);
smart_str_append_long(buf, *var_already);
smart_str_appendc(buf, ';');