You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2024/02/02 15:42:32 UTC

svn commit: r1915546 - in /pdfbox/trunk/pdfbox/src: main/java/org/apache/pdfbox/filter/Filter.java test/java/org/apache/pdfbox/filter/TestFilters.java

Author: tilman
Date: Fri Feb  2 15:42:31 2024
New Revision: 1915546

URL: http://svn.apache.org/viewvc?rev=1915546&view=rev
Log:
PDFBOX-5760: avoid NPE, as suggested by Heewon Lee; closes #178

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/TestFilters.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java?rev=1915546&r1=1915545&r2=1915546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java Fri Feb  2 15:42:31 2024
@@ -199,6 +199,7 @@ public abstract class Filter
      * @param results list of optional decoding results for each filter
      * @return the decoded stream data
      * @throws IOException if the stream cannot be decoded
+     * @throws IllegalArgumentException if filterList is empty
      */
     public static RandomAccessRead decode(InputStream encoded, List<Filter> filterList,
             COSDictionary parameters, DecodeOptions options, List<DecodeResult> results)
@@ -206,6 +207,10 @@ public abstract class Filter
     {
         int length = parameters.getInt(COSName.LENGTH,
                 RandomAccessReadBuffer.DEFAULT_CHUNK_SIZE_4KB);
+        if (filterList.isEmpty())
+        {
+            throw new IllegalArgumentException("Empty filterList");
+        }
         if (filterList.size() > 1)
         {
             Set<Filter> filterSet = new HashSet<>(filterList);

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/TestFilters.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/TestFilters.java?rev=1915546&r1=1915545&r2=1915546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/TestFilters.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/TestFilters.java Fri Feb  2 15:42:31 2024
@@ -16,19 +16,21 @@
  */
 package org.apache.pdfbox.filter;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 
 import java.util.Random;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -177,6 +179,15 @@ class TestFilters
         checkEncodeDecode(rleFilter, input8);
     }
 
+    @Test
+    void testEmptyFilterList() throws Exception
+    {
+        assertThrows(IllegalArgumentException.class, () ->
+        {
+            Filter.decode(null, new ArrayList(), new COSDictionary(), null, null);
+        });
+    }
+
     private void checkEncodeDecode(Filter filter, byte[] original) throws IOException
     {
         ByteArrayOutputStream encoded = new ByteArrayOutputStream();