You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2017/10/08 12:23:53 UTC
svn commit: r1811482 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Author: lehmi
Date: Sun Oct 8 12:23:52 2017
New Revision: 1811482
URL: http://svn.apache.org/viewvc?rev=1811482&view=rev
Log:
PDFBOX-3628: skip corrupt streams when performing a brute force search for object streams
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1811482&r1=1811481&r2=1811482&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Sun Oct 8 12:23:52 2017
@@ -1759,15 +1759,37 @@ public class COSParser extends BaseParse
long stmObjNumber = readObjectNumber();
readGenerationNumber();
readExpectedString(OBJ_MARKER, true);
- COSDictionary dict = parseCOSDictionary();
- int offsetFirstStream = dict.getInt(COSName.FIRST);
- int nrOfObjects = dict.getInt(COSName.N);
- COSStream stream = parseCOSStream(dict);
- COSInputStream is = stream.createInputStream();
- byte[] numbersBytes = new byte[offsetFirstStream];
- is.read(numbersBytes);
- is.close();
- stream.close();
+ int nrOfObjects = 0;
+ byte[] numbersBytes = null;
+ COSStream stream = null;
+ COSInputStream is = null;
+ try
+ {
+ COSDictionary dict = parseCOSDictionary();
+ int offsetFirstStream = dict.getInt(COSName.FIRST);
+ nrOfObjects = dict.getInt(COSName.N);
+ stream = parseCOSStream(dict);
+ is = stream.createInputStream();
+ numbersBytes = new byte[offsetFirstStream];
+ is.read(numbersBytes);
+ }
+ catch (IOException exception)
+ {
+ LOG.debug(
+ "Skipped corrupt stream: (" + stmObjNumber + " 0 at offset " + offset);
+ continue;
+ }
+ finally
+ {
+ if (is != null)
+ {
+ is.close();
+ }
+ if (stream != null)
+ {
+ stream.close();
+ }
+ }
int start = 0;
// skip spaces
while (numbersBytes[start] == 32)