@@ -1,4 +1,9 @@

+Mon Feb 12 21:15:00 GMT 2007 (njh)

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

+  * libclamav/entconv.c:	Code tidy for bounds checking compilers

+

 Mon Feb 12 22:08:15 CET 2007 (acab)

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

   * libclamav/packlibs: fix possible heap overflow (thanks Edvin)

 Mon Feb 12 21:59:49 CET 2007 (tk)

@@ -953,12 +953,15 @@ unsigned char* encoding_norm_readline(struct entity_conv* conv, FILE* stream_in,

 			}

 			else {

 				char buff[10];

+				const int len = strlen(buff);

+

 				snprintf(buff,9,"&#%d;",u16);

 				buff[9] = '\0';

-				if(norm + strlen(buff) >= norm_end)

+				if((norm_end - norm) <= len)

+					/* prevent buffer overflow */

 					break;

-				strncpy((char*)norm, buff, strlen(buff));

-				norm += strlen(buff);

+				memcpy((char*)norm, buff, len);

+				norm += len;

 			}	

 		}

 		conv->out_area.offset = i; /* so that we can resume next time from here */