Index: php_domxml.c
===================================================================
RCS file: /repository/php4/ext/domxml/php_domxml.c,v
retrieving revision 1.118.2.6
diff -u -r1.118.2.6 php_domxml.c
--- php_domxml.c	13 Mar 2002 08:15:54 -0000	1.118.2.6
+++ php_domxml.c	4 Apr 2002 20:15:30 -0000
@@ -718,9 +718,7 @@
 {
 	zval *wrapper;
 
-	if (! found) {
 		*found = 0;
-	}
 
 	if (!obj) {
 		MAKE_STD_ZVAL(wrapper);
@@ -825,9 +823,7 @@
 	zval *wrapper;
 	int rsrc_type;
 
-	if (! found) {
 		*found = 0;
-	}
 
 	if (!obj) {
 		MAKE_STD_ZVAL(wrapper);
@@ -911,9 +907,7 @@
 	char *content;
 	int rsrc_type;
 
-	if (! found) {
 		*found = 0;
-	}
 
 	if (!obj) {
 		MAKE_STD_ZVAL(wrapper);
@@ -950,6 +944,7 @@
 			if (content) {
 				add_property_long(wrapper, "type", Z_TYPE_P(nodep));
 				add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
+				xmlFree(content);
 			}
 			break;
 		}
@@ -963,6 +958,7 @@
 			if (content) {
 				add_property_long(wrapper, "type", Z_TYPE_P(nodep));
 				add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
+				xmlFree(content);
 			}
 			break;
 		}
@@ -974,8 +970,10 @@
 			rsrc_type = le_domxmlpip;
 			content = xmlNodeGetContent(nodep);
 			add_property_stringl(wrapper, "target", (char *) nodep->name, strlen(nodep->name), 1);
-			if (content)
+			if (content) {
 				add_property_stringl(wrapper, "data", (char *) content, strlen(content), 1);
+				xmlFree(content);
+			}
 			break;
 		}
 
@@ -998,8 +996,10 @@
 			add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1);
 			if (Z_TYPE_P(obj) == XML_ENTITY_REF_NODE) {
 				content = xmlNodeGetContent(nodep);
-				if (content)
+				if (content) {
 					add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
+					xmlFree(content);
+				}
 			}
 			break;
 		}
@@ -1012,8 +1012,10 @@
 			add_property_stringl(wrapper, "name", (char *) attrp->name, strlen(attrp->name), 1);
 			add_property_long(wrapper, "type", Z_TYPE_P(attrp));
 			content = xmlNodeGetContent((xmlNodePtr) attrp);
-			if (content)
+			if (content) {
 				add_property_stringl(wrapper, "value", (char *) content, strlen(content), 1);
+				xmlFree(content);
+			}
 			break;
 		}
 
@@ -1067,8 +1069,10 @@
 			rsrc_type = le_domxmlcdatap;
 			content = xmlNodeGetContent(nodep);
 			add_property_long(wrapper, "type", Z_TYPE_P(nodep));
-			if (content)
+			if (content) {
 				add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
+				xmlFree(content);
+			}
 			break;
 		}
 
@@ -1720,7 +1724,7 @@
 }
 /* }}} */
 
-/* {{{ proto object domxml_node_prefix(void)
+/* {{{ proto string domxml_node_prefix(void)
    Returns namespace prefix of node */
 PHP_FUNCTION(domxml_node_prefix)
 {
@@ -2074,7 +2078,8 @@
 		RETURN_FALSE;
 	}
 		
-	RETURN_STRING(mem,1);
+	RETVAL_STRING(mem,1);
+	xmlFree(mem);
 }
 /* }}} */
 
@@ -2172,9 +2177,10 @@
 
 	value = xmlGetProp(nodep, name);
 	if (!value) {
-		RETURN_EMPTY_STRING();
+		RETURN_FALSE;
 	} else {
-		RETURN_STRING(value, 1);
+		RETVAL_STRING(value, 1);
+		xmlFree(value);
 	}
 }
 /* }}} */
@@ -2784,9 +2790,12 @@
 
 	htmlDocDumpMemory(docp, &mem, &size);
 	if (!size) {
+		if (mem)
+			xmlFree(mem);
 		RETURN_FALSE;
 	}
-	RETURN_STRINGL(mem, size, 1);
+	RETVAL_STRINGL(mem, size, 1);
+	xmlFree(mem);
 }
 /* }}} */
 
@@ -3367,9 +3376,7 @@
 	zval *wrapper;
 	int rsrc_type;
 
-	if (! found) {
 		*found = 0;
-	}
 
 	if (!obj) {
 		MAKE_STD_ZVAL(wrapper);