Some phishes were getting through - bug33

git-svn: trunk@2476

clamav-devel/ChangeLog

@@ -1,6 +1,10 @@
+Fri Nov  3 19:47:42 GMT 2006 (njh)
+----------------------------------
+  * libclamav/mbox.c:	Partial fix for bug 33
+
 Thu Nov  2 09:36:06 GMT 2006 (njh)
 ----------------------------------
-  * libclamav/js/jsint.h:	Fix compilatin error under FreeBSD6.1
+  * libclamav/js/jsint.h:	Fix compilation error under FreeBSD6.1
 
 Thu Nov  2 00:20:36 CET 2006 (tk)
 ---------------------------------

clamav-devel/libclamav/mbox.c

@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA 02110-1301, USA.
  */
-static	char	const	rcsid[] = "$Id: mbox.c,v 1.357 2006/10/29 13:54:06 njh Exp $";
+static	char	const	rcsid[] = "$Id: mbox.c,v 1.358 2006/11/03 19:47:16 njh Exp $";
 
 #ifdef	_MSC_VER
 #include <winsock.h>	/* only needed in CL_EXPERIMENTAL */
@@ -1673,6 +1673,14 @@ parseEmailFile(FILE *fin, const table_t *rfc821, const char *firstLine, const ch
 						continue;
 				}
 
+				/*
+				 * Handle broken headers, where the next
+				 * line isn't indented by whitespace
+				 */
+				if(fullline[fulllinelength - 2] == ';')
+					/* Add arguments to this line */
+					continue;
+
 				if(line && (count_quotes(fullline) & 1))
 					continue;