cvs: php-src /ext/simplexml simplexml.c
| From: | Marcus Boerger | Date: | Sun, 26 Oct 2003 00:39:48 +0000 |
| Subject: | cvs: php-src /ext/simplexml simplexml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24260@lists.php.net to get a copy of this message | ||
helly Sat Oct 25 20:39:48 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix casting (the question is when & what should be freed here).
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.69 php-src/ext/simplexml/simplexml.c:1.70
--- php-src/ext/simplexml/simplexml.c:1.69 Sat Oct 25 19:06:19 2003
+++ php-src/ext/simplexml/simplexml.c Sat Oct 25 20:39:48 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.69 2003/10/25 23:06:19 helly Exp $ */
+/* $Id: simplexml.c,v 1.70 2003/10/26 00:39:48 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -360,7 +360,7 @@
if (node->children && node->children->type == XML_TEXT_NODE &&
!xmlIsBlankNode(node->children)) {
contents = xmlNodeListGetString(node->doc, node->children, 1);
if (contents) {
- ZVAL_STRING(*value, contents, 0);
+ ZVAL_STRING(*value, contents, 1);
}
} else {
subnode = php_sxe_object_new(TSRMLS_C);
@@ -739,6 +739,8 @@
{
if (contents) {
ZVAL_STRINGL(object, contents, strlen(contents), 1);
+ object->refcount = 1;
+ object->is_ref = 0;
}
switch (type) {
@@ -794,7 +796,7 @@
xmlFree(contents);
}
if (should_free) {
- zval_dtor(&free_obj);
+ /*zval_dtor(&free_obj);*/
}
return rv;
}
@@ -1091,7 +1093,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.69 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");