@@ -1,3 +1,7 @@

+Sat Aug 18 13:25:52 BST 2007 (njh)

+----------------------------------

+  * libclamav/pdf.c:	Bug 618, --block-max not always honoured

+

 Tue Aug 14 23:23:00 EEST 2007 (edwin)

 ----------------------------------

   * libclamav/phishcheck.c, regex_list.c, phish_whitelist.c: make debug output

@@ -213,7 +213,7 @@ cli_pdf(const char *dir, int desc, const cli_ctx *ctx)

 	/*

 	 * The body section consists of a sequence of indirect objects

 	 */

-	while((p < xrefstart) &&

+	while((p < xrefstart) && (rc == CL_CLEAN) &&

 	      ((q = pdf_nextobject(p, bytesleft)) != NULL)) {

 		int is_ascii85decode, is_flatedecode, fout, len, has_cr;

 		/*int object_number, generation_number;*/

@@ -421,7 +421,7 @@ cli_pdf(const char *dir, int desc, const cli_ctx *ctx)

 		 * Calculate the length ourself, the Length parameter is often

 		 * wrong

 		 */

-		if(*--streamend != '\n')

+		if((*--streamend != '\n') && (*streamend != '\r'))

 			streamend++;

 		else if(has_cr && (*--streamend != '\r'))

 			streamend++;