FOP-3068: NPE when reading a invalid TTC file

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1901445 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop-core/src/main/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java b/fop-core/src/main/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
index 9e8d9e5dbc05f8ac8cd5a786cefd55d38a3e9299..a7353eb1ef4b901635a4a8c3fff80068b2b5a6bb 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
@@ -203,6 +203,9 @@ public class FontInfoFinder {
                 TTFFile ttf = new TTFFile(false, false);
                 FontFileReader reader = new FontFileReader(in);
                 ttcNames = ttf.getTTCnames(reader);
+                if (ttcNames == null) {
+                    return null;
+                }
             } catch (Exception e) {
                 if (this.eventListener != null) {
                     this.eventListener.fontLoadingErrorAtAutoDetection(this,

diff --git a/fop-core/src/test/java/org/apache/fop/fonts/FontInfoFinderTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/FontInfoFinderTestCase.java
new file mode 100644 (file)
index 0000000..1a7af66
--- /dev/null
+++ b/fop-core/src/test/java/org/apache/fop/fonts/FontInfoFinderTestCase.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.fonts;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.commons.io.IOUtils;
+
+import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
+import org.apache.fop.fonts.autodetect.FontInfoFinder;
+
+public class FontInfoFinderTestCase {
+    @Test
+    public void testInvalidTTC() throws Exception {
+        InternalResourceResolver rr = ResourceResolverFactory.createDefaultInternalResourceResolver(
+                new File(".").toURI());
+        File ttc = File.createTempFile("fop", ".ttc");
+        File ttf = new File("test/resources/fonts/ttf/glb12.ttf");
+        byte[] ttfBytes = IOUtils.toByteArray(new FileInputStream(ttf));
+        new FileOutputStream(ttc).write(ttfBytes);
+        EmbedFontInfo[] embedFontInfos = new FontInfoFinder().find(ttc.toURI(), rr, null);
+        ttc.delete();
+        Assert.assertNull(embedFontInfos);
+    }
+}