cvs: php-src /ext/xml xml.c

sterling Wed Jul 2 16:05:13 2003 EDT Modified files: /php-src/ext/xml xml.c Log: Not really the best way to solve this. But it doesn't give a segfault on self-referential structures, which is always a bonus Index: php-src/ext/xml/xml.c diff -u php-src/ext/xml/xml.c:1.133 php-src/ext/xml/xml.c:1.134 --- php-src/ext/xml/xml.c:1.133 Sat Jun 14 14:14:05 2003 +++ php-src/ext/xml/xml.c Wed Jul 2 16:05:13 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.133 2003/06/14 18:14:05 rrichards Exp $ */ +/* $Id: xml.c,v 1.134 2003/07/02 20:05:13 sterling Exp $ */ #define IS_EXT_MODULE @@ -374,17 +374,17 @@ /* {{{ xml_set_handler() */ static void xml_set_handler(zval **handler, zval **data) { - /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */ - if (Z_TYPE_PP(data) != IS_ARRAY) { - convert_to_string_ex(data); - } - /* If we have already a handler, release it */ if (*handler) { zval_ptr_dtor(handler); } - zval_add_ref(data); + /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */ + if (Z_TYPE_PP(data) != IS_ARRAY) { + convert_to_string_ex(data); + zval_add_ref(data); + } + *handler = *data; } /* }}} */