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

+Thu Jul 14 12:29:17 EEST 2011 (edwin)

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

+ * libclamav/pdf.c: fix encrypted pdf detection (bb #2988)

+

 Thu Jul 14 12:20:04 CEST 2011 (acab)

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

  * clamav-milter/clamfi.c: fix typo in error message (bb#3040)

@@ -1325,6 +1325,11 @@ static void pdf_handle_enc(struct pdf_struct *pdf)

     O = U = NULL;

     do {

 	EM = pdf_readbool(q, len, "/EncryptMetadata", 1);

+	P = pdf_readint(q, len, "/P");

+	if (P == ~0u) {

+	    cli_dbgmsg("cli_pdf: invalid P\n");

+	    break;

+	}

 	q2 = cli_memstr(q, len, "/Standard", 9);

 	if (!q2) {

@@ -1380,11 +1385,6 @@ static void pdf_handle_enc(struct pdf_struct *pdf)

 		break;

 	    }

 	}

-	P = pdf_readint(q, len, "/P");

-	if (P == ~0u) {

-	    cli_dbgmsg("cli_pdf: invalid P\n");

-	    break;

-	}

 	length = pdf_readint(q, len, "/Length");

 	if (length == ~0u)

 	    length = 40;