--- parser3/src/main/untaint.C	2003/01/28 13:15:19	1.115.2.1
+++ parser3/src/main/untaint.C	2003/01/29 11:06:44	1.115.2.3
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_UNTAINT_C="$Date: 2003/01/28 13:15:19 $";
+static const char* IDENT_UNTAINT_C="$Date: 2003/01/29 11:06:44 $";
 
 #include "pa_pool.h"
 #include "pa_string.h"
@@ -188,7 +188,7 @@ String& String::append_to(String& dest,
 
 size_t String::cstr_bufsize(Untaint_lang lang,
 							SQL_Connection *connection,
-							const char *charset_name) const {
+							const Request_charsets *charsets) const {
 	size_t dest=1; // for terminating 0
 	STRING_FOREACH_FRAGMENT(
 		uchar to_lang=lang==UL_UNSPECIFIED?fragment->lang:lang;
@@ -220,7 +220,7 @@ size_t String::cstr_bufsize(Untaint_lang
 			break;
 		case UL_MAIL_HEADER:
 			// tainted, untaint language: mail-header
-			if(charset_name) {
+			if(charsets && charsets->mail) {
 				int parts_count=1;
 				const char *prev=fragment->ptr;
 				size_t size=fragment->size;
@@ -232,7 +232,7 @@ size_t String::cstr_bufsize(Untaint_lang
 				// Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?=
 				dest+=
 					fragment->size*3+
-					parts_count*(strlen(charset_name)+MAX_STRING/* worst: =?charset?Q?=%XX?= */);
+					parts_count*(charsets->mail->name()->size()+MAX_STRING/* worst: =?charset?Q?=%XX?= */);
 			} else
 				dest+=fragment->size;
 			break;
@@ -312,7 +312,7 @@ static bool mail_header_char_valid_withi
 }
 char *String::store_to(char *dest, Untaint_lang lang, 
 					   SQL_Connection *connection,
-					   const char *charset_name) const {
+					   const Request_charsets *charsets) const {
 	// WARNING:
 	//	 before any changes check cstr_bufsize first!!!
 	bool whitespace=true;
@@ -341,9 +341,9 @@ char *String::store_to(char *dest, Untai
 			// tainted, untaint language: file [name]
 			escape(
 				// Macintosh has problems with small Russian letter 'r'
-				if( *src=='\xF0' && pool().get_source_charset().name()=="windows-1251" ) {
+				if( *src=='\xF0' && charsets && *charsets->source->name()=="windows-1251" ) {
 					// fixing that letter for most common charset
-					to_char('p');  
+					to_char('p');
 				} else // fallback to default
 					encode(need_file_encode, '_'); 
 			);
@@ -352,9 +352,15 @@ char *String::store_to(char *dest, Untai
 			// tainted, untaint language: uri
 			const void *client_ptr;
 			size_t client_size;
-			Charset::transcode(pool(), 
-				pool().get_source_charset(), fragment->ptr, fragment->size,
-				pool().get_client_charset(), client_ptr, client_size);
+			if(charsets) 
+				Charset::transcode(*charsets->pool, 
+					*charsets->source, fragment->ptr, fragment->size,
+					*charsets->client, client_ptr, client_size);
+			else {
+				client_ptr=fragment->ptr; 
+				client_size=fragment->size;
+			}
+
 			{
 				const char *src=(const char *)client_ptr;
 				for(int size=client_size; size--; src++) 
@@ -370,9 +376,12 @@ char *String::store_to(char *dest, Untai
 		case UL_MAIL_HEADER:
 			// tainted, untaint language: mail-header
 			// http://www.ietf.org/rfc/rfc2047.txt
-			if(charset_name) {
+			if(charsets && charsets->mail) {
 				const void *mail_ptr;
 				size_t mail_size;
+				Charset::transcode(*charsets->pool, 
+					*charsets->source, fragment->ptr, fragment->size,
+					*charsets->mail, mail_ptr, mail_size);
 
 				// Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?=
 				const char *src=(const char *)mail_ptr;
@@ -426,7 +435,7 @@ char *String::store_to(char *dest, Untai
 				dest+=connection->quote(dest, fragment->ptr, fragment->size);
 			else
 				throw Exception(0,
-					this,
+					ConstStringPtr(this),
 					"untaint in SQL language failed - no connection specified");
 			break;
 		case UL_JS:
@@ -460,7 +469,7 @@ char *String::store_to(char *dest, Untai
 			break;
 		default:
 			throw Exception(0, 
-				this, 
+				ConstStringPtr(this), 
 				"unknown untaint language #%d", 
 					static_cast<int>(to_lang)); // should never
 			break; // never
@@ -491,9 +500,9 @@ char *String::store_to(char *dest, Untai
 	return dest;
 }
 
-char *String::cstr_debug_origins() const {
+char *String::cstr_debug_origins(Pool& pool) const {
 	//_asm int 3;
-	char *result=(char *)malloc(size()+used_rows()*MAX_STRING*2);
+	char *result=new(pool) char[size()+fused*MAX_STRING*2];
 	char *dest=result;
 	
 	STRING_FOREACH_FRAGMENT(
@@ -508,7 +517,7 @@ IFNDEF_NO_STRING_ORIGIN(
 		uchar show_lang=fragment->lang & ~UL_OPTIMIZE_BIT;
 		if(show_lang>=sizeof(String_Untaint_lang_name)/sizeof(String_Untaint_lang_name[0]))
 			throw Exception(0, 
-				this, 
+				ConstStringPtr(this), 
 				"unknown untaint language #%d", 
 					static_cast<int>(show_lang)); // sould never