PDFBOX-6101: avoid NPE, refactor

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

Author: THausherr

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java

@@ -405,10 +405,7 @@ private FontBoxFont findFont(FontFormat format, String postScriptName)
         }
 
         // make sure the font provider is initialized
-        if (fontProvider == null)
-        {
-            getProvider();
-        }
+        getProvider();
 
         // first try to match the PostScript name
         FontInfo info = getFont(format, postScriptName);
@@ -510,7 +507,7 @@ public CIDFontMapping getCIDFont(String baseFont, PDFontDescriptor fontDescripto
             return new CIDFontMapping(null, ttf, false);
         }
 
-        if (cidSystemInfo != null)
+        if (cidSystemInfo != null && fontDescriptor != null)
         {
             // "In Acrobat 3.0.1 and later, Type 0 fonts that use a CMap whose CIDSystemInfo
             // dictionary defines the Adobe-GB1, Adobe-CNS1 Adobe-Japan1, or Adobe-Korea1 character
@@ -554,6 +551,9 @@ else if (font != null)
     private PriorityQueue<FontMatch> getFontMatches(PDFontDescriptor fontDescriptor,
                                                            PDCIDSystemInfo cidSystemInfo)
     {
+        // make sure the font provider is initialized
+        getProvider();
+
         PriorityQueue<FontMatch> queue = new PriorityQueue<>(20);
 
         for (FontInfo info : fontInfoByName.values())