Fix NPE in FontSelector#getFont()

DEVSIX-2451 SUP-3599 SUP-3839
itext · Apr 16, 2019 · c0fb696 · c0fb696
1 parent 70ec889
commit c0fb696
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/iTextSharp/text/pdf/FontSelector.cs b/src/core/iTextSharp/text/pdf/FontSelector.cs
@@ -161,7 +161,9 @@ public class FontSelector {
         }
 
         protected Font GetFont(int i) {
-            return i < fonts.Count ? fonts[i] : unsupportedFonts[i];
+            return i < fonts.Count
+                ? fonts[i]
+                : unsupportedFonts[i - fonts.Count];
         }
 
         private bool IsSupported(Font font) {

diff --git a/src/extras/itextsharp.xmlworker/iTextSharp/tool/xml/Tag.cs b/src/extras/itextsharp.xmlworker/iTextSharp/tool/xml/Tag.cs
@@ -356,7 +356,7 @@ public class Tag : IEnumerable<Tag> {
          */
         private Tag RecursiveGetChild(Tag tag, String name, String ns, bool recursive) {
             foreach (Tag t in tag) {
-                if (t.tag.Equals(name) && t.ns.Equals(ns)) {
+                if (t != null && t.tag.Equals(name) && t.ns.Equals(ns)) {
                     return t;
                 } else if (recursive) {
                     Tag rT = null;