cvs: php-src /ext/simplexml simplexml.c
| From: | Antony Dovgal | Date: | Tue, 20 Feb 2007 13:21:54 +0000 |
| Subject: | cvs: php-src /ext/simplexml simplexml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-43150@lists.php.net to get a copy of this message | ||
tony2001 Tue Feb 20 13:21:54 2007 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix #38406 (crash when assigning objects to SimpleXML attributes)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.228&r2=1.229&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.228 php-src/ext/simplexml/simplexml.c:1.229
--- php-src/ext/simplexml/simplexml.c:1.228 Mon Feb 12 21:13:01 2007
+++ php-src/ext/simplexml/simplexml.c Tue Feb 20 13:21:54 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.228 2007/02/12 21:13:01 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.229 2007/02/20 13:21:54 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -56,6 +56,7 @@
static zend_object_value php_sxe_register_object(php_sxe_object * TSRMLS_DC);
static xmlNodePtr php_sxe_reset_iterator(php_sxe_object *sxe, int use_data TSRMLS_DC);
static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, int use_data
TSRMLS_DC);
+static zval *sxe_get_value(zval *z TSRMLS_DC);
/* {{{ _node_as_zval()
*/
@@ -428,6 +429,7 @@
int is_attr = 0;
int nodendx = 0;
int test = 0;
+ int new_value = 0;
long cnt;
zval tmp_zv, trim_zv, value_copy;
@@ -506,8 +508,17 @@
break;
case IS_STRING:
break;
+ case IS_OBJECT:
+ if (Z_OBJCE_P(value) == sxe_class_entry) {
+ value = sxe_get_value(value TSRMLS_CC);
+ INIT_PZVAL(value);
+ new_value = 1;
+ break;
+ }
+ /* break is missing intentionally */
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "It is not yet possible to assign complex
types to %s", attribs ? "attributes" : "properties");
+ return;
}
}
@@ -596,6 +607,9 @@
if (value && value == &value_copy) {
zval_dtor(value);
}
+ if (new_value) {
+ zval_ptr_dtor(&value);
+ }
}
/* }}} */
@@ -2396,7 +2410,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.228 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.229 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");