commit c5c9add140120290e73cea19a55a6ff552c6fb3c
author Tilman Hausherr <tilman@apache.org> Tue Jun 25 18:48:48 2024 +0000
committer Tilman Hausherr <tilman@apache.org> Tue Jun 25 18:48:48 2024 +0000
tree cba7e8cc130837ff3ecc474a5d261d81e0edc089
parent 10b952c53d4beb27da6016bffa3b18e01fd26da0

PDFBOX-5660: Sonar fix

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1918620 13f79535-47bb-0310-9956-ffa450edef68

pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilterDecoderStream.java

diff --git a/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilterDecoderStream.java b/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilterDecoderStream.java
index eba555c..fb2dee4 100644
--- a/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilterDecoderStream.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilterDecoderStream.java
@@ -38,7 +38,6 @@
 
     private boolean isEOF = false;
     private int currentDataIndex = 0;
-    private int bytesRead = 0;
     private int bytesDecoded = 0;
 
     private byte[] buffer = new byte[2048];
@@ -67,12 +66,11 @@
         {
             isEOF = true;
             bytesDecoded = 0;
-            bytesRead = 0;
             return false;
         }
         if (inflater.needsInput())
         {
-            bytesRead = in.read(buffer);
+            int bytesRead = in.read(buffer);
             if (bytesRead > -1)
             {
                 inflater.setInput(buffer, 0, bytesRead);
@@ -120,12 +118,9 @@
         {
             return -1;
         }
-        if (currentDataIndex == bytesDecoded)
+        if (currentDataIndex == bytesDecoded && !fetch())
         {
-            if (!fetch())
-            {
-                return -1;
-            }
+            return -1;
         }
         return decodedData[currentDataIndex++] & 0xFF;
     }