--- parser3/src/main/untaint.C	2004/07/01 07:20:10	1.133
+++ parser3/src/main/untaint.C	2005/08/05 13:03:03	1.134.6.1
@@ -1,11 +1,11 @@
 /** @file
 	Parser: String class part: untaint mechanizm.
 
-	Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_UNTAINT_C="$Date: 2004/07/01 07:20:10 $";
+static const char * const IDENT_UNTAINT_C="$Date: 2005/08/05 13:03:03 $";
 
 
 #include "pa_string.h"
@@ -478,6 +478,8 @@ int cstr_to_string_body_block(char alang
 String::Body String::cstr_to_string_body(Language lang, 
 		  SQL_Connection* connection,
 		  const Request_charsets *charsets) const {
+	if(is_empty())
+		return String::Body();
 
 	Cstr_to_string_body_block_info info;
 	// input
@@ -492,8 +494,6 @@ String::Body String::cstr_to_string_body
 	info.fragment_begin=0;
 	info.whitespace=true;
 
-	if(!is_empty())
-		langs.for_each(body, cstr_to_string_body_block, &info);
-
+	langs.for_each(body, cstr_to_string_body_block, &info);
 	return String::Body(CORD_ec_to_cord(info.result));
 }