* libclamav/htmlnorm.c: fix decoding of hex char encoding

(spotted by Tomasz Klim)
  * libclamav/filetypes.c: add '<script' tags to HTML rule set


git-svn: trunk@666

clamav-devel/ChangeLog

@@ -1,3 +1,9 @@
+Mon Jul 12 16:03:11 BST 2004 (trog)
+-----------------------------------
+  * libclamav/htmlnorm.c: fix decoding of hex char encoding
+	(spotted by Tomasz Klim)
+  * libclamav/filetypes.c: add '<script' tags to HTML rule set
+
 Sun Jul 11 16:39:42 CEST 2004 (tk)
 ----------------------------------
   * libclamav: scanners: scan raw executables before trying to unpack them

clamav-devel/libclamav/filetypes.c

@@ -116,18 +116,20 @@ static const struct cli_smagic_s cli_smagic[] = {
     {"46726f6d3a20*436f6e74656e742d547970653a20",    "Mail file", CL_MAILFILE},
 
     /* remember the matcher is case sensitive */
-    {"3c62723e",    "HTML data", CL_HTMLFILE},	/* <br> */
-    {"3c42723e",    "HTML data", CL_HTMLFILE},	/* <Br> */
-    {"3c42523e",    "HTML data", CL_HTMLFILE},	/* <BR> */
-    {"3c703e",	    "HTML data", CL_HTMLFILE},	/* <p> */
-    {"3c503e",	    "HTML data", CL_HTMLFILE},	/* <P> */
-    {"68726566",    "HTML data", CL_HTMLFILE},	/* href */
-    {"48726566",    "HTML data", CL_HTMLFILE},	/* Href */
-    {"48524546",    "HTML data", CL_HTMLFILE},	/* HREF */
-    {"3c666f6e74",  "HTML data", CL_HTMLFILE},	/* <font */
-    {"3c466f6e74",  "HTML data", CL_HTMLFILE},	/* <Font */
-    {"3c464f4e54",  "HTML data", CL_HTMLFILE},	/* <FONT */
-
+    {"3c62723e",       "HTML data", CL_HTMLFILE},	/* <br> */
+    {"3c42723e",       "HTML data", CL_HTMLFILE},	/* <Br> */
+    {"3c42523e",       "HTML data", CL_HTMLFILE},	/* <BR> */
+    {"3c703e",	       "HTML data", CL_HTMLFILE},	/* <p> */
+    {"3c503e",	       "HTML data", CL_HTMLFILE},	/* <P> */
+    {"68726566",       "HTML data", CL_HTMLFILE},	/* href */
+    {"48726566",       "HTML data", CL_HTMLFILE},	/* Href */
+    {"48524546",       "HTML data", CL_HTMLFILE},	/* HREF */
+    {"3c666f6e74",     "HTML data", CL_HTMLFILE},	/* <font */
+    {"3c466f6e74",     "HTML data", CL_HTMLFILE},	/* <Font */
+    {"3c464f4e54",     "HTML data", CL_HTMLFILE},	/* <FONT */
+    {"3c736372697074", "HTML data", CL_HTMLFILE},	/* <script */
+    {"3c536372697074", "HTML data", CL_HTMLFILE},	/* <Script */
+    {"3c534352495054", "HTML data", CL_HTMLFILE},	/* <SCRIPT */
 
     {NULL,  NULL,   CL_UNKNOWN_TYPE}
 };

clamav-devel/libclamav/htmlnorm.c

@@ -176,7 +176,11 @@ unsigned int decode_html_char_ref(unsigned char *cref,
 		} else {
 			value *= 10;
 		}
-		value += (*cref - '0');
+		if (isdigit(*cref)) {
+			value += (*cref - '0');
+		} else {
+			value += (tolower(*cref) - 'a' + 10);
+		}
 		cref++;
 		count++;
 	}