You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/04/14 16:58:20 UTC
svn commit: r1876521 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font:
FileSystemFontProvider.java PDCIDFontType2.java PDTrueTypeFont.java
Author: tilman
Date: Tue Apr 14 16:58:20 2020
New Revision: 1876521
URL: http://svn.apache.org/viewvc?rev=1876521&view=rev
Log:
PDFBOX-4813: don't catch NPE
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1876521&r1=1876520&r2=1876521&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Tue Apr 14 16:58:20 2020
@@ -193,7 +193,7 @@ final class FileSystemFontProvider exten
}
return ttf;
}
- catch (NullPointerException | IOException e)
+ catch (IOException e)
{
// NPE due to TTF parser being buggy
LOG.error("Could not load font file: " + file, e);
@@ -568,7 +568,7 @@ final class FileSystemFontProvider exten
{
ttc.processAllFonts(ttf -> addTrueTypeFontImpl(ttf, ttcFile));
}
- catch (NullPointerException | IOException e)
+ catch (IOException e)
{
// NPE due to TTF parser being buggy
LOG.error("Could not load font file: " + ttcFile, e);
@@ -595,7 +595,7 @@ final class FileSystemFontProvider exten
addTrueTypeFontImpl(ttf, ttfFile);
}
}
- catch (NullPointerException | IOException e)
+ catch (IOException e)
{
// NPE due to TTF parser being buggy
LOG.error("Could not load font file: " + ttfFile, e);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java?rev=1876521&r1=1876520&r2=1876521&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java Tue Apr 14 16:58:20 2020
@@ -121,7 +121,7 @@ public class PDCIDFontType2 extends PDCI
LOG.warn("Found CFF/OTF but expected embedded TTF font " + fd.getFontName());
}
}
- catch (NullPointerException | IOException e)
+ catch (IOException e)
{
// NPE due to TTF parser being buggy
fontIsDamaged = true;
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=1876521&r1=1876520&r2=1876521&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 Apr 14 16:58:20 2020
@@ -106,7 +106,7 @@ public class PDTrueTypeFont extends PDSi
TTFParser ttfParser = new TTFParser(true);
ttfFont = ttfParser.parse(ff2Stream.createInputStream());
}
- catch (NullPointerException | IOException e)
+ catch (IOException e)
{
// NPE due to TTF parser being buggy
LOG.warn("Could not read embedded TTF for font " + getBaseFont(), e);