handle & in URLs, even with

entity-converter off; don't leave & in URLs (bb
  #535)


git-svn: trunk@3100

ChangeLog

@@ -1,3 +1,9 @@
+Sat Jun 16 19:41:00 EEST 2007 (edwin)
+------------------------------------
+  * libclamav/htmlnorm.c, entconv.c: handle & in URLs, even with
+  entity-converter off; don't leave & in URLs (bb
+  #535)
+
 Sat Jun 16 19:11:00 EEST 2007 (edwin)
 ------------------------------------
   * libclamav/regex_list.c: match M:/H: signatures only at end of string (bb

libclamav/entconv.c

@@ -62,8 +62,6 @@ unsigned char* entity_norm(const struct entity_conv* conv,const unsigned char* e
 			return (unsigned char*)cli_strdup("<");
 		else if(val == '>')/* see above */
 			return (unsigned char*)cli_strdup(">");
-		else if(val == '&')/* see above */
-			return (unsigned char*)cli_strdup("&");
 		else if(val<127) {
 			unsigned char *e_out = cli_malloc(2);
 

libclamav/htmlnorm.c

@@ -1175,10 +1175,10 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag
 					hex=TRUE;
 					ptr++;
 				} else if (*ptr == ';') {
-					if(dconf_entconv) {
-						if (next_state==HTML_TAG_ARG_VAL && tag_val_length < HTML_STR_LENGTH) {
+					if (next_state==HTML_TAG_ARG_VAL && tag_val_length < HTML_STR_LENGTH) {
 							tag_val[tag_val_length++] = value; /* store encoded values too */
-						}
+					}
+					if(dconf_entconv) {
 
 						if(value < 0x80)
 							html_output_c(file_buff_o1, file_buff_o2, tolower(value));