svn commit: r1918316 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java

[tilman]

Author: tilman
Date: Fri Jun 14 08:49:24 2024
New Revision: 1918316

URL: http://svn.apache.org/viewvc?rev=1918316&view=rev
Log:
PDFBOX-5839: avoid NPE

Modified:
    
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java?rev=1918316&r1=1918315&r2=1918316&view=diff
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
 (original)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
 Fri Jun 14 08:49:24 2024
@@ -196,7 +196,11 @@ public class PDOptionalContentProperties
         COSArray ocgs = getOCGs();
         for (COSBase base : ocgs)
         {
-            coll.add(new PDOptionalContentGroup(toDictionary(base)));
+            COSDictionary dict = toDictionary(base);
+            if (dict != null)
+            {
+                coll.add(new PDOptionalContentGroup(dict));
+            }
         }
         return coll;
     }
@@ -239,7 +243,14 @@ public class PDOptionalContentProperties
         {
             COSBase obj = ocgs.get(i);
             COSDictionary ocg = toDictionary(obj);
-            groups[i] = ocg.getString(COSName.NAME);
+            if (ocg == null)
+            {
+                groups[i] = "";
+            }
+            else
+            {
+                groups[i] = ocg.getString(COSName.NAME);
+            }
         }
         return groups;
     }