Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROB: Replace error by warning for EOD in RunLengthDecode/ASCIIHexDecode #2334

Merged
merged 11 commits into from
Mar 30, 2024
Merged

ROB: Replace error by warning for EOD in RunLengthDecode/ASCIIHexDecode #2334

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7621d8e
BUG: Relax flate decoding for too many lookup values
stefan6419846 Dec 7, 2023
676abc8
only accept whitespace characters as trailing ones
stefan6419846 Dec 8, 2023
c34e9fc
fix import sort oder
stefan6419846 Dec 8, 2023
73308dc
add test with trailing newline
stefan6419846 Dec 8, 2023
52fdd5c
ENH : tolerate missing EOD at end of RunLengthDecode
pubpub-zz Dec 9, 2023
c72d34a
Merge branch 'main' into completion_eod
MartinThoma Dec 10, 2023
28ee1fa
Merge branch 'main' into completion_eod
MartinThoma Dec 23, 2023
67623f6
Merge branch 'main' into completion_eod
pubpub-zz Mar 30, 2024
e5e6cfc
add Warnings
pubpub-zz Mar 30, 2024
9de1b33
fix
pubpub-zz Mar 30, 2024
e642e19
whitespaces
pubpub-zz Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pypdf/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ def decode(
index = 0
while True:
if index >= len(data):
raise PdfStreamError("Unexpected EOD in ASCIIHexDecode")
break # reach End Of String even if no EOD
pubpub-zz marked this conversation as resolved.
Show resolved Hide resolved
# raise PdfStreamError("Unexpected EOD in ASCIIHexDecode")
char = data[index : index + 1]
if char == b">":
break
Expand Down Expand Up @@ -340,7 +341,8 @@ def decode(
index = 0
while True:
if index >= len(data):
raise PdfStreamError("Unexpected EOD in RunLengthDecode")
break # reach End Of String even if no EOD
pubpub-zz marked this conversation as resolved.
Show resolved Hide resolved
# raise PdfStreamError("Unexpected EOD in ASCIIHexDecode")
pubpub-zz marked this conversation as resolved.
Show resolved Hide resolved
length = data[index]
index += 1
if length == 128:
Expand Down
16 changes: 6 additions & 10 deletions tests/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from PIL import Image

from pypdf import PdfReader
from pypdf.errors import DeprecationError, PdfReadError, PdfStreamError
from pypdf.errors import DeprecationError, PdfReadError
from pypdf.filters import (
ASCII85Decode,
ASCIIHexDecode,
Expand Down Expand Up @@ -131,9 +131,9 @@ def test_ascii_hex_decode_method(data, expected):

def test_ascii_hex_decode_missing_eod():
"""ASCIIHexDecode.decode() raises error when no EOD character is present."""
with pytest.raises(PdfStreamError) as exc:
ASCIIHexDecode.decode("")
assert exc.value.args[0] == "Unexpected EOD in ASCIIHexDecode"
# with pytest.raises(PdfStreamError) as exc:
ASCIIHexDecode.decode("")
# assert exc.value.args[0] == "Unexpected EOD in ASCIIHexDecode"


@pytest.mark.enable_socket()
Expand Down Expand Up @@ -501,14 +501,10 @@ def test_runlengthdecode():
url = "https://github.com/py-pdf/pypdf/files/12162905/out.pdf"
name = "FailedRLE1.pdf"
reader = PdfReader(BytesIO(get_data_from_url(url, name=name)))
with pytest.raises(PdfStreamError) as exc:
reader.pages[0].images[0]
assert exc.value.args[0] == "Unexpected EOD in RunLengthDecode"
reader.pages[0].images[0]
url = "https://github.com/py-pdf/pypdf/files/12162926/out.pdf"
name = "FailedRLE2.pdf"
with pytest.raises(PdfStreamError) as exc:
reader.pages[0].images[0]
assert exc.value.args[0] == "Unexpected EOD in RunLengthDecode"
reader.pages[0].images[0]


@pytest.mark.enable_socket()
Expand Down
Loading