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

Jump to bottom

ROB: Relax flate decoding for too many lookup values #2331

Merged
merged 5 commits into from
Dec 10, 2023
Merged

ROB: Relax flate decoding for too many lookup values #2331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 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
5d3fc66
Merge branch 'main' into relax-flate-lookup
MartinThoma Dec 9, 2023
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
10 changes: 8 additions & 2 deletions pypdf/_xobj_image_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from io import BytesIO
from typing import Any, List, Tuple, Union, cast

from ._utils import logger_warning
from ._utils import WHITESPACES, logger_warning
from .constants import ColorSpaces
from .errors import PdfReadError
from .generic import (
Expand Down Expand Up @@ -195,7 +195,13 @@
else:
if img.mode == "1":
# Two values ("high" and "low").
assert len(lookup) == 2 * nb, len(lookup)
expected_count = 2 * nb
if len(lookup) != expected_count:
if len(lookup) < expected_count:
raise PdfReadError(f"Not enough lookup values: Expected {expected_count}, got {len(lookup)}.")

Check warning on line 201 in pypdf/_xobj_image_helpers.py

View check run for this annotation

Codecov / codecov/patch

pypdf/_xobj_image_helpers.py#L201 

Added line #L201 was not covered by tests
lookup = lookup[:expected_count]
if not all(_value in WHITESPACES for _value in lookup[expected_count:]):
raise PdfReadError(f"Too many lookup values: Expected {expected_count}, got {len(lookup)}.")

Check warning on line 204 in pypdf/_xobj_image_helpers.py

View check run for this annotation

Codecov / codecov/patch

pypdf/_xobj_image_helpers.py#L204 

Added line #L204 was not covered by tests
colors_arr = [lookup[:nb], lookup[nb:]]
arr = b"".join(
[
Expand Down
9 changes: 9 additions & 0 deletions tests/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,3 +589,12 @@ def test_flate_decode_with_image_mode_1():
reader = PdfReader(BytesIO(get_data_from_url(url, name=name)))
for image in reader.pages[7].images:
_ = image


@pytest.mark.enable_socket()
def test_flate_decode_with_image_mode_1__whitespace_at_end_of_lookup():
"""From #2331"""
url = "https://github.com/py-pdf/pypdf/files/13611048/out1.pdf"
name = "issue2331.pdf"
reader = PdfReader(BytesIO(get_data_from_url(url, name=name)))
reader.pages[0].images[0]
Loading