Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B2D3C200B81 for ; Tue, 13 Sep 2016 08:28:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B15D3160AD2; Tue, 13 Sep 2016 06:28:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 069D7160AC6 for ; Tue, 13 Sep 2016 08:28:36 +0200 (CEST) Received: (qmail 90778 invoked by uid 500); 13 Sep 2016 06:28:36 -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 90769 invoked by uid 99); 13 Sep 2016 06:28:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2016 06:28:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id B0B88C1269 for ; Tue, 13 Sep 2016 06:28:35 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.676 X-Spam-Level: X-Spam-Status: No, score=0.676 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.124] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id phkg1uewwIEp for ; Tue, 13 Sep 2016 06:28:33 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 7DF535FBC9 for ; Tue, 13 Sep 2016 06:28:33 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 00942E0099 for ; Tue, 13 Sep 2016 06:28:33 +0000 (UTC) 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 EFC873A028D for ; Tue, 13 Sep 2016 06:28:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1760481 - in /pdfbox/trunk: fontbox/src/main/java/org/apache/fontbox/ttf/OTFParser.java fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Date: Tue, 13 Sep 2016 06:28:32 -0000 To: commits@pdfbox.apache.org From: jahewson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160913062832.EFC873A028D@svn01-us-west.apache.org> archived-at: Tue, 13 Sep 2016 06:28:37 -0000 Author: jahewson Date: Tue Sep 13 06:28:32 2016 New Revision: 1760481 URL: http://svn.apache.org/viewvc?rev=1760481&view=rev Log: PDFBOX-3488: Don't allow CFF fonts in TTFParser Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OTFParser.java pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OTFParser.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OTFParser.java?rev=1760481&r1=1760480&r2=1760481&view=diff ============================================================================== --- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OTFParser.java (original) +++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OTFParser.java Tue Sep 13 06:28:32 2016 @@ -104,4 +104,10 @@ public final class OTFParser extends TTF return super.readTable(font, tag); } } + + @Override + protected boolean allowCFF() + { + return true; + } } Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java?rev=1760481&r1=1760480&r2=1760481&view=diff ============================================================================== --- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java (original) +++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java Tue Sep 13 06:28:32 2016 @@ -175,7 +175,7 @@ public class TTFParser } } - boolean isPostScript = font.tables.containsKey(CFFTable.TAG); + boolean isPostScript = allowCFF() && font.tables.containsKey(CFFTable.TAG); HeaderTable head = font.getHeader(); if (head == null) @@ -232,6 +232,11 @@ public class TTFParser } } + protected boolean allowCFF() + { + return false; + } + private TTFTable readTableDirectory(TrueTypeFont font, TTFDataStream raf) throws IOException { TTFTable table = null; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1760481&r1=1760480&r2=1760481&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Tue Sep 13 06:28:32 2016 @@ -443,11 +443,6 @@ public class PDTrueTypeFont extends PDSi @Override public GeneralPath getPath(int code) throws IOException { - if (ttf.getGlyph() == null) - { - throw new IOException("glyf table is missing in font " + getName()); - } - int gid = codeToGID(code); GlyphData glyph = ttf.getGlyph().getGlyph(gid);