From de4d21f530fa46ffee89be59d4f2edeb46331d51 Mon Sep 17 00:00:00 2001
From: pubpub-zz <4083478+pubpub-zz@users.noreply.github.com>
Date: Fri, 21 Jul 2023 09:08:37 +0200
Subject: [PATCH 1/2] BUG : error in hex decode filter

closes  #1983
---
 pypdf/filters.py      | 24 ++++++++++++++----------
 tests/test_filters.py | 29 +++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/pypdf/filters.py b/pypdf/filters.py
index a6bcb2d64..00551d2db 100644
--- a/pypdf/filters.py
+++ b/pypdf/filters.py
@@ -245,10 +245,10 @@ class ASCIIHexDecode:
 
     @staticmethod
     def decode(
-        data: str,
+        data: Union[str, bytes],
         decode_parms: Union[None, ArrayObject, DictionaryObject] = None,
         **kwargs: Any,
-    ) -> str:
+    ) -> bytes:
         """
         Decode an ASCII-Hex encoded data stream.
 
@@ -268,24 +268,26 @@ def decode(
         if "decodeParms" in kwargs:  # deprecated
             deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
             decode_parms = kwargs["decodeParms"]  # noqa: F841
-        retval = ""
-        hex_pair = ""
+        if isinstance(data, str):
+            data = data.encode()
+        retval = b""
+        hex_pair = b""
         index = 0
         while True:
             if index >= len(data):
                 raise PdfStreamError("Unexpected EOD in ASCIIHexDecode")
-            char = data[index]
-            if char == ">":
+            char = data[index : index + 1]
+            if char == b">":
                 break
             elif char.isspace():
                 index += 1
                 continue
             hex_pair += char
             if len(hex_pair) == 2:
-                retval += chr(int(hex_pair, base=16))
-                hex_pair = ""
+                retval += bytes((int(hex_pair, base=16),))
+                hex_pair = b""
             index += 1
-        assert hex_pair == ""
+        assert hex_pair == b""
         return retval
 
 
@@ -852,6 +854,8 @@ def _handle_jpx(
 
     size = (x_object_obj[IA.WIDTH], x_object_obj[IA.HEIGHT])
     data = x_object_obj.get_data()  # type: ignore
+    if isinstance(data, str):  # pragma: no cover
+        data = data.encode()
     colors = x_object_obj.get("/Colors", 1)
     color_space: Any = x_object_obj.get("/ColorSpace", NullObject()).get_object()
     if (
@@ -912,7 +916,7 @@ def _handle_jpx(
             "TIFF",
             ".tiff",
         )
-    elif lfilters is None:
+    else:
         img, image_format, extension = Image.frombytes(mode, size, data), "PNG", ".png"
 
     # CMYK image without decode requires reverting scale (cf p243,2§ last sentence)
diff --git a/tests/test_filters.py b/tests/test_filters.py
index c70b5192c..90a8f83af 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -84,26 +84,26 @@ def test_flate_decode_decompress_with_array_params(params):
 @pytest.mark.parametrize(
     ("data", "expected"),
     [
-        (">", ""),
+        (">", b""),
         (
             "6162636465666768696a6b6c6d6e6f707172737475767778797a>",
-            string.ascii_lowercase,
+            string.ascii_lowercase.encode(),
         ),
         (
             "4142434445464748494a4b4c4d4e4f505152535455565758595a>",
-            string.ascii_uppercase,
+            string.ascii_uppercase.encode(),
         ),
         (
             "6162636465666768696a6b6c6d6e6f707172737475767778797a4142434445464748494a4b4c4d4e4f505152535455565758595a>",
-            string.ascii_letters,
+            string.ascii_letters.encode(),
         ),
-        ("30313233343536373839>", string.digits),
+        ("30313233343536373839>", string.digits.encode()),
         (
             "3  031323334353637   3839>",
-            string.digits,
+            string.digits.encode(),
         ),  # Same as previous, but whitespaced
-        ("30313233343536373839616263646566414243444546>", string.hexdigits),
-        ("20090a0d0b0c>", string.whitespace),
+        ("30313233343536373839616263646566414243444546>", string.hexdigits.encode()),
+        ("20090a0d0b0c>", string.whitespace.encode()),
     ],
     ids=[
         "empty",
@@ -135,6 +135,19 @@ def test_ascii_hex_decode_missing_eod():
     assert exc.value.args[0] == "Unexpected EOD in ASCIIHexDecode"
 
 
+@pytest.mark.enable_socket()
+def test_decode_ahx():
+    """
+    Cf #1979
+    Gray Image in CMYK : requiring reverse
+    """
+    url = "https://github.com/py-pdf/pypdf/files/12090692/New.Jersey.Coinbase.staking.securities.charges.2023-0606_Coinbase-Penalty-and-C-D.pdf"
+    name = "NewJersey.pdf"
+    reader = PdfReader(BytesIO(get_pdf_from_url(url, name=name)))
+    for p in reader.pages:
+        _ = list(p.images.keys())
+
+
 @pytest.mark.xfail()
 def test_ascii85decode_with_overflow():
     inputs = (

From 49363d79e0424257357963688ae689b840c40863 Mon Sep 17 00:00:00 2001
From: pubpub-zz <4083478+pubpub-zz@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:43:44 +0200
Subject: [PATCH 2/2] Update tests/test_filters.py

Co-authored-by: Martin Thoma <info@martin-thoma.de>
---
 tests/test_filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_filters.py b/tests/test_filters.py
index 90a8f83af..e9dfb559c 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -138,7 +138,7 @@ def test_ascii_hex_decode_missing_eod():
 @pytest.mark.enable_socket()
 def test_decode_ahx():
     """
-    Cf #1979
+    See #1979
     Gray Image in CMYK : requiring reverse
     """
     url = "https://github.com/py-pdf/pypdf/files/12090692/New.Jersey.Coinbase.staking.securities.charges.2023-0606_Coinbase-Penalty-and-C-D.pdf"