Browse code

leave <0x20 characters untouched in cl_experimental (don't normalize them to &xx;)

git-svn: trunk@2942

Török Edvin authored on 2007/03/15 04:21:52
Showing 3 changed files
... ...
@@ -1,3 +1,8 @@
1
+Mon Mar 14 19:29:00 EET 2007 (edwin)
2
+---------------------------------
3
+  * libclamav/htmlnorm.c,entconv.c: leave <0x20 characters untouched in
4
+  cl_experimental (don't normalize them to &xx;)
5
+
1 6
 Mon Mar 12 20:31:07 CET 2007 (tk)
2 7
 ---------------------------------
3 8
   * libclamav: extract and scan PE files embedded into other executables or
... ...
@@ -946,7 +946,7 @@ unsigned char* encoding_norm_readline(struct entity_conv* conv, FILE* stream_in,
946 946
 					cli_dbgmsg("Skipping null character in html stream\n");
947 947
 			}
948 948
 			}
949
-			else if((u16 < 0x80 && u16 >= 0x20) || (u16 <= 0xff && isspace(u16))) {
949
+			else if(u16 < 0x80) {
950 950
 				if(norm >= norm_end)
951 951
 					break;
952 952
 				if((unsigned char)u16 ==0)
... ...
@@ -1214,7 +1214,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag
1214 1214
 						tag_val[tag_val_length++] = value; /* store encoded values too */
1215 1215
 					}
1216 1216
 
1217
-					if((value < 0x80 && value >= 0x20) || (value >= 0 && value <= 0xff && isspace(value)))
1217
+					if(value < 0x80)
1218 1218
 						html_output_c(file_buff_o1, file_buff_o2, tolower(value));
1219 1219
 					else {
1220 1220
 						unsigned char buff[10];