Skip to content

Updated pdfreader to properly handle xref streams. #149

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

Open
JimBiardCics wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated pdfreader to properly handle xref streams. #149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f5e73
Updated pdfreader to properly handle xref streams.
JimBiardCics Aug 19, 2018
16812d0
Fixed a bug I introduced in the order of processing of xref sections.
JimBiardCics Sep 12, 2018
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
42 changes: 41 additions & 1 deletion pdfrw/pdfreader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,18 +613,58 @@ def __init__(self, fname=None, fdata=None, decompress=False,

# Find all the xref tables/streams, and
# then deal with them backwards.
#
xref_list = []

while 1:
# Parse the xref table, getting object offsets, a trailer, and
# a stream flag.
#
source.obj_offsets = {}

trailer, is_stream = self.parsexref(source)
prev = trailer.Prev

# Get any previous section or xref stream section offsets from
# the trailer.
#
prev = trailer.Prev
xrefStream = trailer.XRefStm

# If there is an xref stream section, process it.
#
if xrefStream:
# Save off the object offsets, trailer, and stream flag just parsed.
#
xref_list.append((source.obj_offsets, trailer, is_stream))

# Parse the xref stream section as above, then return the
# source pointer to its original location.
#
savedLoc = source.floc

source.obj_offsets = {}

source.floc = int(xrefStream)

trailer, is_stream = self.parsexref(source)

source.floc = savedLoc

# If there is no previous section, finish up and break out of
# the loop.
if prev is None:
token = source.next()
if token != 'startxref' and not xref_list:
source.warning('Expected "startxref" '
'at end of xref table')
break

# There is a previous section, so save off the object offsets,
# trailer, and stream flag just parsed, set the source pointer
# to the previous section, and keep parsing.
#
xref_list.append((source.obj_offsets, trailer, is_stream))

source.floc = int(prev)

# Handle document encryption
Expand Down