--- parser3/src/main/pa_common.C	2010/07/05 05:55:21	1.262
+++ parser3/src/main/pa_common.C	2012/03/02 21:57:28	1.264
@@ -1,7 +1,7 @@
 /** @file
 	Parser: commonly functions.
 
-	Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2012 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
  * BASE64 part
@@ -26,7 +26,7 @@
  *
  */
 
-static const char * const IDENT_COMMON_C="$Date: 2010/07/05 05:55:21 $"; 
+static const char * const IDENT_COMMON_C="$Date: 2012/03/02 21:57:28 $"; 
 
 #include "pa_common.h"
 #include "pa_exception.h"
@@ -211,23 +211,24 @@ File_read_result file_read(Request_chars
 
 	if(as_text){
 		if(result.success){
+			Charset* asked_charset=0;
 			if(result.length>=3 && strncmp(result.str, "\xEF\xBB\xBF", 3)==0){
 				// skip UTF-8 signature (BOM code)
 				result.str+=3;
 				result.length-=3;
+				asked_charset=&UTF8_charset;
 			}
 			
-			if(result.length && transcode_text_result && params){ // must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below
-				if(Value* vcharset_name=params->get(PA_CHARSET_NAME)){
-					Charset asked_charset=::charsets.get(vcharset_name->as_string().
-						change_case(charsets.source(), String::CC_UPPER));
+			if(params)
+				if(Value* vcharset_name=params->get(PA_CHARSET_NAME))
+					asked_charset=&::charsets.get(vcharset_name->as_string().change_case(charsets.source(), String::CC_UPPER));
+
+			if(result.length && transcode_text_result && asked_charset){ // length must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below
+				String::C body=String::C(result.str, result.length);
+				body=Charset::transcode(body, *asked_charset, charsets.source());
 
-					String::C body=String::C(result.str, result.length);
-					body=Charset::transcode(body, asked_charset, charsets.source());
-
-					result.str=const_cast<char*>(body.str); // hacking a little
-					result.length=body.length;
-				}
+				result.str=const_cast<char*>(body.str); // hacking a little
+				result.length=body.length;
 			}
 		}
 		if(result.length)
@@ -1303,14 +1304,17 @@ static void file_base64_file_action(
 }
 
 void pa_base64_decode(const char *in, size_t in_size, char*& result, size_t& result_size) {
-	/* wont go to more than had (overly conservative) */
-	result=new(PointerFreeGC) char[in_size+1/*terminator*/];
+	// every 4 base64 bytes are converted into 3 normal bytes
+	// not full set (tail) of 4-bytes set is ignored
+	size_t new_size=in_size/4*3;
+	result=new(PointerFreeGC) char[new_size+1/*terminator*/];
+
 	int state=0;
 	int save=0;
 	result_size=
 		g_mime_utils_base64_decode_step ((const unsigned char*)in, in_size, 
 		(unsigned char*)result, &state, &save);
-	assert(result_size <= in_size);
+	assert(result_size <= new_size);
 	result[result_size]=0; // for text files
 }