@@ -1,4 +1,7 @@

 Sat Feb 17 11:20:17 CET 2007 (edwin)

+  * libclamav/entconv.c: Don't normalize buffer shorter than 2 bytes.

+

+Sat Feb 17 11:20:17 CET 2007 (edwin)

   * libclamav/rtf.c: Fix possible memory leak, and add more sanity checks.

 Sat Feb 17 02:34:17 CET 2007 (acab)

@@ -807,7 +807,7 @@ static iconv_t iconv_open_cached(const unsigned char* fromcode)

 /* tmp_m_area and conv->out_area are of size maxlen */

 unsigned char* encoding_norm_readline(struct entity_conv* conv, FILE* stream_in, m_area_t* in_m_area, const size_t maxlen)

 {

-	if(!conv || !conv->out_area.buffer || !conv->tmp_area.buffer)

+	if(!conv || !conv->out_area.buffer || !conv->tmp_area.buffer || maxlen<2 )

 		return NULL;

 	else {

 		/* stream_in|in_m_area ->(read_raw) conv->tmp_area -> (iconv) conv->out_area -> (normalize) conv->norm_area -> (cli_readline) return value*/