match obfuscated JPEG files

git-svn: trunk@951

clamav-devel/ChangeLog

@@ -1,3 +1,7 @@
+Thu Sep 30 09:24:26 BST 2004 (trog)
+-----------------------------------
+  * libclamav/special.c: match obfuscated JPEG files
+
 Thu Sep 30 10:01:23 CEST 2004 (tk)
 ----------------------------------
   * libclamav/matcher: handle Exploit.JPEG.Comment.*

clamav-devel/libclamav/special.c

@@ -82,6 +82,12 @@ int cli_check_jpeg_exploit(int fd)
 		if ((retval=cli_readn(fd, buffer, 4)) != 4) {
 			return 0;
 		}
+		/* Check for multiple 0xFF values, we need to skip them */
+		if ((buffer[0] == 0xff) && (buffer[1] == 0xff)) {
+			lseek(fd, -3, SEEK_CUR);
+			continue;
+		}
+		
 		if ((buffer[0] == 0xff) && (buffer[1] == 0xfe)) {
 			if (buffer[2] == 0x00) {
 				if ((buffer[3] == 0x00) || (buffer[3] == 0x01)) {