Fix NPE in FontSelector#getFont()

DEVSIX-2451 SUP-3599 SUP-3839
LibrePDF · Apr 16, 2019 · bd17c0f · bd17c0f
1 parent e855ec3
commit bd17c0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/itext/src/main/java/com/itextpdf/text/pdf/FontSelector.java b/itext/src/main/java/com/itextpdf/text/pdf/FontSelector.java
@@ -164,7 +164,9 @@ protected int getSize() {
     }
 
     protected Font getFont(int i) {
-        return i < fonts.size() ? fonts.get(i) : unsupportedFonts.get(i);
+        return i < fonts.size()
+                ? fonts.get(i)
+                : unsupportedFonts.get(i - fonts.size());
     }
 
     private boolean isSupported(Font font) {

diff --git a/xmlworker/src/main/java/com/itextpdf/tool/xml/Tag.java b/xmlworker/src/main/java/com/itextpdf/tool/xml/Tag.java
@@ -360,7 +360,7 @@ private boolean recursiveHasChild(final Tag tag, final String name, final String
 	 */
 	private Tag recursiveGetChild(final Tag tag, final String name, final String ns, final boolean recursive) {
 		for (Tag t : 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;