Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2795C10459 for ; Fri, 23 Jan 2015 18:42:37 +0000 (UTC) Received: (qmail 63902 invoked by uid 500); 23 Jan 2015 18:42:31 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 63880 invoked by uid 500); 23 Jan 2015 18:42:31 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 63870 invoked by uid 99); 23 Jan 2015 18:42:30 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2015 18:42:30 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id D24AAAC0044; Fri, 23 Jan 2015 18:42:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1654303 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java Date: Fri, 23 Jan 2015 18:42:30 -0000 To: commits@pdfbox.apache.org From: lehmi@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150123184230.D24AAAC0044@hades.apache.org> Author: lehmi Date: Fri Jan 23 18:42:30 2015 New Revision: 1654303 URL: http://svn.apache.org/r1654303 Log: PDFBOX-2615: skip endobject marker when reading an object stream Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java?rev=1654303&r1=1654302&r2=1654303&view=diff ============================================================================== --- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java (original) +++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java Fri Jan 23 18:42:30 2015 @@ -120,6 +120,13 @@ public class PDFObjectStreamParser exten { LOG.debug( "parsed=" + object ); } + // According to the spec objects within an object stream shall not be enclosed + // by obj/endobj tags, but there are some pdfs in the wild using those tags + // skip endobject marker if present + if (!pdfSource.isEOF() && pdfSource.peek() == 'e') + { + readLine(); + } objectCounter++; } }