You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2023/05/06 09:54:43 UTC

svn commit: r1909648 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java

Author: lehmi
Date: Sat May  6 09:54:43 2023
New Revision: 1909648

URL: http://svn.apache.org/viewvc?rev=1909648&view=rev
Log:
PDFBOX-5595: use null instead of COSNUll for corrupt entries within a content stream 

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=1909648&r1=1909647&r2=1909648&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java Sat May  6 09:54:43 2023
@@ -738,7 +738,10 @@ public abstract class BaseParser
                     return po;
                 }
             }
-            po.add(pbo);
+            else
+            {
+                po.add(pbo);
+            }
             skipSpaces();
         }
         // read ']'
@@ -928,7 +931,7 @@ public abstract class BaseParser
             {
                 LOG.warn("Skipped unexpected dir object = '" + badString + "' at offset "
                         + source.getPosition() + " (start offset: " + startOffset + ")");
-                return COSNull.NULL;
+                return this instanceof PDFStreamParser ? null : COSNull.NULL;
             }
         }
         return null;