You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/09/17 21:54:58 UTC

svn commit: r1625791 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java

Author: tilman
Date: Wed Sep 17 19:54:58 2014
New Revision: 1625791

URL: http://svn.apache.org/r1625791
Log:
PDFBOX-2342: catch CryptographyException like it is done elsewhere

Modified:
    pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java

Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java?rev=1625791&r1=1625790&r2=1625791&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java Wed Sep 17 19:54:58 2014
@@ -1350,7 +1350,16 @@ public class NonSequentialPDFParser exte
                             }
                             else if (entry.getValue() instanceof COSArray)
                             {
-                                securityHandler.decryptArray((COSArray) entry.getValue(), objNr, objGenNr);
+                                try
+                                {
+                                    securityHandler.decryptArray((COSArray) entry.getValue(), objNr, objGenNr);
+                                }
+                                catch (CryptographyException ce)
+                                {
+                                    throw new IOException("Error decrypting stream object " + objNr + ": "
+                                            + ce.getMessage()
+                                    /* , ce // TODO: remove remark with Java 1.6 */);
+                                }
                             }                             
                         }
                     }