@@ -1,3 +1,14 @@

+Wed Jan 23 15:54:00 EET 2008 (edwin)

+------------------------------------

+  * contrib/entitynorm, entconv.c: fix valid characters table for encoding name

+  * libclamav/entconv.[ch]:

+			* skip \0 characters

+			* account for alignfix when calculating offset

+			* reset iconv state before reusing  

+  			* fix entity handling 

+  			* fix memory leaks reported by valgrind

+			* remove unused fields

+

 Wed Jan 23 12:49:46 CET 2008 (tk)

 ---------------------------------

   * freshclam/manager.c: reduce the number of error messages (bb#478);

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

 PERL=perl

 CC=cc

-all: entitylist.h encoding_aliases.h gentbl

+all: entitylist.h encoding_aliases.h gentbl encname_chars.h

 entities_parsed: entities entities/* entity_decl_parse.pl

 	$(PERL) entity_decl_parse.pl $</* | sort -u >$@

@@ -20,6 +20,8 @@ encoding_aliases.h: generate_encoding_aliases

 gentbl: gentbl.c

 	$(CC) $< -o $@

+encname_chars.h: gentbl

+	./gentbl encname_chars 0-9 a-z A-Z _ . / \( \) - : >$@

 clean: 

 	rm -f entitylist.h encoding_aliases.h entities_parsed generate_entitylist generate_encoding_aliases gentbl

@@ -16,7 +16,7 @@ int main(int argc, char* argv[])

 		tbl[*v] = 1;

 		if(v[1] == '-') {

 			int j;

-			for(j=v[0]+1;j<v[2];j++) {

+			for(j=v[0]+1;j<=v[2];j++) {

 				tbl[j]=1;

 			}

 		} else if(v[1]){

@@ -76,7 +76,7 @@ static inline unsigned char* u16_normalize(uint16_t u16, unsigned char* out, con

 		assert((uint8_t)u16 != 0);

 		*out++ = (uint8_t)u16;

 	}

-	else {

+	else if (u16) {

 		/* normalize only >255 to speed up */

 		char buf[10];

 		const ssize_t max_num_length = sizeof(buf)-1;

@@ -103,14 +103,14 @@ static inline unsigned char* u16_normalize(uint16_t u16, unsigned char* out, con

 const char* entity_norm(struct entity_conv* conv,const unsigned char* entity)

 {

-	struct element* e = hashtab_find(conv->ht, (const char*)entity, strlen((const char*)entity));

+	struct element* e = hashtab_find(&entities_htable, (const char*)entity, strlen((const char*)entity));

 	if(e && e->key) {

 		const uint16_t val = e->data;

 		unsigned char* out = u16_normalize(val, conv->entity_buff, sizeof(conv->entity_buff)-1);

 		if(out) {

 			*out++ = '\0';

 		}

-		return (const char*) out;

+		return (const char*) conv->entity_buff;

 	}

 	return NULL;

 }

@@ -132,9 +132,6 @@ int init_entity_converter(struct entity_conv* conv, size_t buffer_size)

 		conv->encoding = NULL;

 		conv->encoding_symbolic = E_UNKNOWN;

 		conv->bom_cnt = 0;

-		conv->buffer_cnt = 0;

-		conv->bytes_read = 0;

-		conv->partial = 0;

 		conv->buffer_size = buffer_size;

 		conv->priority = NOPRIO;

 		/* start in linemode */

@@ -166,9 +163,6 @@ int init_entity_converter(struct entity_conv* conv, size_t buffer_size)

 			return CL_EMEM;

 		}

-		conv->ht = &entities_htable;

-		conv->msg_zero_shown = 0;

-

 		conv->iconv_struct = cli_calloc(1, sizeof(iconv_t));

 		if(!conv->iconv_struct) {

 			free(conv->tmp_area.buffer);

@@ -520,16 +514,16 @@ static inline void process_bom(struct entity_conv* conv)

 	conv->has_bom = has_bom;

 }

-/*()-./012345678:ABCDEFGHIJKLMNOPQRSTUVWXY_abcdefghijklmnopqrstuvwxy*/

+/*()-./0123456789:ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz*/

 static const uint8_t encname_chars[256] = {

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

         0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1,

-        1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0,

+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,

         0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1,

+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,

         0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,

+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

@@ -583,6 +577,9 @@ static int encoding_norm_done(struct entity_conv* conv)

 		free(conv->norm_area.buffer);

 		conv->norm_area.buffer = NULL;

 	}

+	if(conv->iconv_struct) {

+		free(conv->iconv_struct);

+	}

 	return 0;

 }

@@ -752,6 +749,9 @@ static iconv_t iconv_open_cached(const char* fromcode)

 		e = NULL;

 	}

 	if(e) {

+		size_t dummy_in, dummy_out;

+		/* reset state */

+		iconv(cache->tab[e->data], NULL, &dummy_in, NULL, &dummy_out);

 		return cache->tab[e->data];

 	}

 	cli_dbgmsg(MODULE_NAME "iconv not found in cache, for encoding:%s\n",fromcode);

@@ -863,6 +863,7 @@ static int in_iconv_u16(m_area_t* in_m_area, iconv_t* iconv_struct, m_area_t* ou

 		memcpy(tmp4, input, alignfix);

 		input = tmp4;

 		inleft = 4;

+		alignfix = 0;

 	}

 	while (inleft && (outleft >= 2)) { /* iconv doesn't like inleft to be 0 */

@@ -891,7 +892,9 @@ static int in_iconv_u16(m_area_t* in_m_area, iconv_t* iconv_struct, m_area_t* ou

 		*out++ = *input++;

 		inleft--;

 	}

-	in_m_area->offset = in_m_area->length - inleft;

+	/* length - offset - alignfix is original value of inleft, new value is inleft, 

+	 * difference tells how much it moved. */

+	in_m_area->offset = in_m_area->length - alignfix - inleft;

 	if(out_m_area->length >= 0 && out_m_area->length >= (off_t)outleft) {

 		out_m_area->length -= (off_t)outleft;

 	} else {

@@ -1036,8 +1039,10 @@ unsigned char* encoding_norm_readline(struct entity_conv* conv, FILE* stream_in,

 						i++;

 						break;

 					}

-					*out++ = c;

-					limit--;

+					if(c) {

+						*out++ = c;

+						limit--;

+					}

 				}

 				in_m_area->offset = i;

 		}

@@ -1048,8 +1053,6 @@ unsigned char* encoding_norm_readline(struct entity_conv* conv, FILE* stream_in,

 		}

 		if(limit < 0) limit = 0;

-/*		assert((unsigned)(conv->out_area.length - limit - 1) < conv->buffer_size);

-		assert(conv->out_area.length - limit - 1 >= 0); */

 		conv->out_area.buffer[conv->out_area.length - limit - 1] = '\0';

 		return conv->out_area.buffer;

 	}

@@ -53,22 +53,16 @@ struct entity_conv {

 	char* encoding;

 	enum encoding_priority priority;

 	enum encodings encoding_symbolic;

-	unsigned short int encoding_specific;/* sub-encoding, used for ISO*/

-	const struct hashtable* ht;

 	uint8_t has_bom;

 	uint8_t enc_bytes;

-	uint8_t bytes_read;

 	uint8_t  bom_cnt;

-	uint32_t partial;

 	unsigned char bom[4];

 	size_t buffer_size;

-	size_t buffer_cnt;

 	void* iconv_struct;

 	unsigned char entity_buff[MAX_ENTITY_SIZE+2];

 	m_area_t tmp_area;

 	m_area_t out_area;

 	m_area_t norm_area;

-	int      msg_zero_shown;

 	int      linemode;/* TODO:set */

 	int      linemode_processed;

 };