From 2935efb446d750a291e39c46b3ab544f387d8652 Mon Sep 17 00:00:00 2001 From: Sterling Hughes Date: Fri, 4 Jul 2003 21:58:09 +0000 Subject: [PATCH] fix memory cverrun when accessing an empty xml element. guess how many lines it took me to write a basic WSDL parser + API? 20 using curl + simplexml --- ext/simplexml/simplexml.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index bc9c616369..af2982f721 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -177,7 +177,7 @@ next_iter: if (counter == 1) { SEPARATE_ZVAL(&value); zval_dtor(return_value); - FREE_ZVAL(return_value); + FREE_ZVAL(return_value); return_value = value; } @@ -715,7 +715,7 @@ sxe_class_name_get(zval *object, char **class_name, zend_uint *class_name_len, i /* {{{ cast_object() */ -static inline void +static void cast_object(zval *object, int type, char *contents TSRMLS_DC) { if (contents) { @@ -727,7 +727,8 @@ cast_object(zval *object, int type, char *contents TSRMLS_DC) switch (type) { case IS_STRING: - return; + convert_to_string(object); + break; case IS_BOOL: convert_to_boolean(object); break; @@ -762,9 +763,8 @@ sxe_object_cast(zval *readobj, zval *writeobj, int type, int should_free TSRMLS_ } if (sxe->node) { - contents = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, sxe->node->children, 1); - if (!xmlIsBlankNode(sxe->node->children) && contents) { - cast_object(writeobj, type, NULL TSRMLS_CC); + if (sxe->node->children) { + contents = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, sxe->node->children, 1); } } -- 2.40.0