From 973244c309b4230772ec66e08313f8b473eae256 Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Fri, 31 Jul 2026 14:05:44 +0300 Subject: [PATCH 1/2] Fix NPE in useCMap() --- src/main/java/org/verapdf/pd/font/cmap/CMap.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/verapdf/pd/font/cmap/CMap.java b/src/main/java/org/verapdf/pd/font/cmap/CMap.java index ad5c6d6e..18e15f96 100644 --- a/src/main/java/org/verapdf/pd/font/cmap/CMap.java +++ b/src/main/java/org/verapdf/pd/font/cmap/CMap.java @@ -166,6 +166,10 @@ public int getCodeFromStream(InputStream stream) throws IOException { * @param another is another CMap. */ public void useCMap(CMap another) { + if (another == null) { + LOGGER.log(Level.WARNING, "The provided CMap is null. No data merged into the current CMap."); + return; + } this.cidMappings.addAll(another.cidMappings); this.codeSpaces.addAll(another.codeSpaces); this.notDefMappings.addAll(another.notDefMappings); From 8b4532fdcc83bfabd9db3d6e5023db0b656a8148 Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Tue, 11 Aug 2026 10:45:52 +0300 Subject: [PATCH 2/2] Update CMap.java --- src/main/java/org/verapdf/pd/font/cmap/CMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/verapdf/pd/font/cmap/CMap.java b/src/main/java/org/verapdf/pd/font/cmap/CMap.java index 18e15f96..1d0c2cfe 100644 --- a/src/main/java/org/verapdf/pd/font/cmap/CMap.java +++ b/src/main/java/org/verapdf/pd/font/cmap/CMap.java @@ -167,7 +167,7 @@ public int getCodeFromStream(InputStream stream) throws IOException { */ public void useCMap(CMap another) { if (another == null) { - LOGGER.log(Level.WARNING, "The provided CMap is null. No data merged into the current CMap."); + LOGGER.log(Level.WARNING, "UseCMap has an invalid value and will be ignored."); return; } this.cidMappings.addAll(another.cidMappings);