Browse code

do not report Suspected.Zip on standard breaking zip archives created by ICEOWS

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1310 77e5149b-7576-45b1-b177-96237e5ba77b

Tomasz Kojm authored on 2005/02/06 00:22:31
Showing 2 changed files
... ...
@@ -1,3 +1,10 @@
1
+Sat Feb  5 16:17:41 CET 2005 (tk)
2
+---------------------------------
3
+  * libclamav/scanners.c: do not report Suspected.Zip on standard breaking zip
4
+			  archives created by ICEOWS (problem reported by
5
+			  Hamacker <sirhamacker*vidy.com.br> and Dirk Mueller
6
+			  <mueller*kde.org>)
7
+
1 8
 Sat Feb  5 09:39:48 GMT 2005 (trog)
2 9
 -----------------------------------
3 10
   * libclamav/special.c: support for big-endian system in RIFF code.
... ...
@@ -18,7 +25,7 @@ Wed Feb  2 08:32:46 GMT 2005 (njh)
18 18
 Tue Feb  1 14:47:21 GMT 2005 (njh)
19 19
 ----------------------------------
20 20
   * libclamav/blob.c:	Sanitise tab characters in filenames ("Heinz Martin"
21
-				<Martin@hemag.ch>)
21
+				<Martin*hemag.ch>)
22 22
 			Decode encapsulated messages that have for some reason
23 23
 				been base64 encoded (even though they're already
24 24
 				7 bit)
... ...
@@ -27,10 +34,10 @@ Tue Feb  1 08:54:46 GMT 2005 (njh)
27 27
 ----------------------------------
28 28
   * clamav-milter:	Delete X-Virus-Status in clamfi_eom not in
29 29
 				clamfi_header. Patch by Jef Poskanzer
30
-				<jef@acme.com>
30
+				<jef*acme.com>
31 31
 			X-Virus-Status now says that virus that it's infected
32 32
 				with. Suggestion by "Hank Beatty"
33
-				<hbeatty@starband.net>
33
+				<hbeatty*starband.net>
34 34
 
35 35
 Tue Feb  1 03:46:22 CET 2005 (tk)
36 36
 ---------------------------------
... ...
@@ -53,7 +60,7 @@ Sun Jan 30 15:18:02 GMT 2005 (njh)
53 53
   * clamav-milter:	SESSION is on now by default, to test clamd
54 54
 			PACKADDR is now uses unsinged to remove warning on
55 55
 				Sun's C compiler, patch by
56
-				"Dugal James P." <jpd@louisiana.edu>
56
+				"Dugal James P." <jpd*louisiana.edu>
57 57
 			Don't check compatibility with sendmail.cf if sendmail
58 58
 				is running on a different machine
59 59
 
... ...
@@ -83,12 +90,12 @@ Thu Jan 27 10:55:35 GMT 2005 (njh)
83 83
 			Downgraded scanmail not defined if --external isn't
84 84
 				given from error to warning
85 85
 			Added -i flag when calling sendmail, suggested by
86
-				Michal Jaegermann <michal@harddata.com>
86
+				Michal Jaegermann <michal*harddata.com>
87 87
 
88 88
 Thu Jan 27 01:35:35 CET 2005 (tk)
89 89
 ---------------------------------
90 90
   * freshclam/manager.c: add support for HTTP/1.0 ansers in IMS (--no-dns) mode
91
-			 (patch by Sven Strickroth <sstrickroth@gym-oha.de>)
91
+			 (patch by Sven Strickroth <sstrickroth*gym-oha.de>)
92 92
 
93 93
 Wed Jan 26 19:27:57 CET 2005 (tk)
94 94
 ---------------------------------
... ...
@@ -340,6 +340,16 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const
340 340
 	    continue;
341 341
 	}
342 342
 
343
+	/* 
344
+	 * Workaround for archives created with ICEOWS.
345
+	 * ZZIP_DIRENT does not contain information on file type
346
+	 * so we try to determine a directory via a filename
347
+	 */
348
+	if(zdirent.d_name[strlen(zdirent.d_name) - 1] == '/') {
349
+	    cli_dbgmsg("Zip: Directory entry with st_size != 0\n");
350
+	    continue;
351
+	}
352
+
343 353
 	/* work-around for problematic zips (zziplib crashes with them) */
344 354
 	if(zdirent.d_csize <= 0 || zdirent.st_size < 0) {
345 355
 	    files++;