Fix a bug which could result in a "Stream has ended unexpectedly" err…

…or being raised unecessarily if a Name object runs right up against the end of a file stream.
py-pdf · Jun 30, 2015 · 431ba70 · 431ba70
1 parent ee0ace6
commit 431ba70
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/PyPDF2/generic.py b/PyPDF2/generic.py
@@ -461,7 +461,7 @@ def writeToStream(self, stream, encryption_key):
 
 
 class NameObject(str, PdfObject):
- delimiterPattern = re.compile(b_("\s+|[()<>[\]{}/%]"))
+ delimiterPattern = re.compile(b_(r"\s+|[()<>[\]{}/%]"))
  surfix = b_("/")
 
  def writeToStream(self, stream, encryption_key):
@@ -473,7 +473,8 @@ def readFromStream(stream, pdf):
  name = stream.read(1)
  if name != NameObject.surfix:
  raise utils.PdfReadError("name read error")
- name += utils.readUntilRegex(stream, NameObject.delimiterPattern)
+ name += utils.readUntilRegex(stream, NameObject.delimiterPattern, 
+ ignore_eof=True)
  if debug: print(name)
  try:
  return NameObject(name.decode('utf-8'))