--- parser3/src/classes/xdoc.C	2009/07/06 08:49:50	1.161
+++ parser3/src/classes/xdoc.C	2009/07/07 05:47:43	1.163
@@ -9,7 +9,7 @@
 
 #ifdef XML
 
-static const char * const IDENT_XDOC_C="$Date: 2009/07/06 08:49:50 $";
+static const char * const IDENT_XDOC_C="$Date: 2009/07/07 05:47:43 $";
 
 #include "libxml/tree.h"
 #include "libxml/HTMLtree.h"
@@ -391,8 +391,9 @@ static void _create(Request& r, MethodPa
 		Temp_lang temp_lang(r, String::L_XML);
 		const String& xml=r.process_to_string(param);
 
-		const char* cstr=xml.cstr(String::L_UNSPECIFIED, 0, &r.charsets);
-		xmldoc=xmlParseMemory(cstr, strlen(cstr));
+		String::Body sbody=xml.cstr_to_string_body_untaint(r.flang, 0, &r.charsets);
+		xmldoc=xmlParseMemory(sbody.cstr(), sbody.length());
+
 		//printf("document=0x%p\n", document);
 		if(!xmldoc || xmlHaveGenericErrors())
 			throw XmlException(0);
@@ -457,9 +458,9 @@ static void _load(Request& r, MethodPara
 	const String* uri=&params.as_string(0, "URI must be string");
 	const char* uri_cstr;
 	if(uri->pos("://")==STRING_NOT_FOUND) // disk path
-		uri_cstr=r.absolute(*uri).cstr_taint(String::L_FILE_SPEC);
+		uri_cstr=r.absolute(*uri).taint_cstr(String::L_FILE_SPEC);
 	else // xxx:// 
-		uri_cstr=uri->cstr_taint(String::L_AS_IS); // leave as-is for xmlParseFile to handle
+		uri_cstr=uri->taint_cstr(String::L_AS_IS); // leave as-is for xmlParseFile to handle
 
 	/// @todo!! add SAFE MODE!!
 	xmlDoc* xmldoc=xmlParseFile(uri_cstr);