Author: tilman Date: Fri Jun 14 08:27:53 2024 New Revision: 1918313 URL: http://svn.apache.org/viewvc?rev=1918313&view=rev Log: PDFBOX-5839: avoid ClassCastException and NPE
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java?rev=1918313&r1=1918312&r2=1918313&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java Fri Jun 14 08:27:53 2024 @@ -149,6 +149,10 @@ public class PDOptionalContentProperties for (COSBase o : ocgs) { COSDictionary ocg = toDictionary(o); + if (ocg == null) + { + continue; + } String groupName = ocg.getString(COSName.NAME); if (groupName.equals(name)) { @@ -268,6 +272,10 @@ public class PDOptionalContentProperties for (COSBase o : ocgs) { COSDictionary ocg = toDictionary(o); + if (ocg == null) + { + continue; + } String name = ocg.getString(COSName.NAME); if (groupName.equals(name) && isGroupEnabled(new PDOptionalContentGroup(ocg))) { @@ -328,14 +336,20 @@ public class PDOptionalContentProperties private COSDictionary toDictionary(COSBase o) { + COSBase base; if (o instanceof COSObject) { - return (COSDictionary)((COSObject)o).getObject(); + base = ((COSObject) o).getObject(); } else { - return (COSDictionary)o; + base = o; } + if (base instanceof COSDictionary) + { + return (COSDictionary) base; + } + return null; } /** @@ -353,6 +367,10 @@ public class PDOptionalContentProperties for (COSBase o : ocgs) { COSDictionary ocg = toDictionary(o); + if (ocg == null) + { + continue; + } String name = ocg.getString(COSName.NAME); if (groupName.equals(name) && setGroupEnabled(new PDOptionalContentGroup(ocg), enable)) {