From commits-return-12269-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Tue Mar 20 18:55:34 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1B36618064A for ; Tue, 20 Mar 2018 18:55:33 +0100 (CET) Received: (qmail 42927 invoked by uid 500); 20 Mar 2018 17:55:33 -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 42917 invoked by uid 99); 20 Mar 2018 17:55:33 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2018 17:55:33 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 725B03A00AF for ; Tue, 20 Mar 2018 17:55:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1827342 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDAbstractContentStream.java Date: Tue, 20 Mar 2018 17:55:31 -0000 To: commits@pdfbox.apache.org From: msahyoun@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180320175532.725B03A00AF@svn01-us-west.apache.org> Author: msahyoun Date: Tue Mar 20 17:55:31 2018 New Revision: 1827342 URL: http://svn.apache.org/viewvc?rev=1827342&view=rev Log: PDFBOX-4159: throw an exception if special graphics state operationsCare used within text mode as this is not permitted Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDAbstractContentStream.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDAbstractContentStream.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDAbstractContentStream.java?rev=1827342&r1=1827341&r2=1827342&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDAbstractContentStream.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDAbstractContentStream.java Tue Mar 20 17:55:31 2018 @@ -526,6 +526,11 @@ public abstract class PDAbstractContentS */ public void transform(Matrix matrix) throws IOException { + if (inTextMode) + { + throw new IllegalStateException("Error: Modifying the current transformation matrix is not allowed within text objects."); + } + writeAffineTransform(matrix.createAffineTransform()); writeOperator("cm"); } @@ -536,6 +541,11 @@ public abstract class PDAbstractContentS */ public void saveGraphicsState() throws IOException { + if (inTextMode) + { + throw new IllegalStateException("Error: Saving the graphics state is not allowed within text objects."); + } + if (!fontStack.isEmpty()) { fontStack.push(fontStack.peek()); @@ -557,6 +567,11 @@ public abstract class PDAbstractContentS */ public void restoreGraphicsState() throws IOException { + if (inTextMode) + { + throw new IllegalStateException("Error: Restoring the graphics state is not allowed within text objects."); + } + if (!fontStack.isEmpty()) { fontStack.pop();