diff options
author | Simon Steiner <ssteiner@apache.org> | 2022-05-31 10:55:23 +0000 |
---|---|---|
committer | Simon Steiner <ssteiner@apache.org> | 2022-05-31 10:55:23 +0000 |
commit | a711036f0f3d5278c55601778f4bfd33ea75d4c6 (patch) | |
tree | 1bb4068dea334b6feaaaf2abd1111986840c5ab0 /fop-core/src | |
parent | ac9bd619342615d96efd643c7d5684ee65004a58 (diff) | |
download | xmlgraphics-fop-a711036f0f3d5278c55601778f4bfd33ea75d4c6.tar.gz xmlgraphics-fop-a711036f0f3d5278c55601778f4bfd33ea75d4c6.zip |
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
Diffstat (limited to 'fop-core/src')
-rw-r--r-- | fop-core/src/main/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java | 3 | ||||
-rw-r--r-- | fop-core/src/test/java/org/apache/fop/fonts/FontInfoFinderTestCase.java | 47 |
2 files changed, 50 insertions, 0 deletions
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 9e8d9e5db..a7353eb1e 100644 --- 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 index 000000000..1a7af666f --- /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); + } +} |