diff --git a/xpdf/xpdf/PDFDoc.cc b/xpdf/xpdf/PDFDoc.cc
index efcda9533..49bf61493 100644
--- a/xpdf/xpdf/PDFDoc.cc
+++ b/xpdf/xpdf/PDFDoc.cc
@@ -115,9 +115,9 @@ PDFDoc::PDFDoc(BaseStream *strA, GString *ownerPassword,
 GBool PDFDoc::setup(GString *ownerPassword, GString *userPassword) {
   str->reset();
   
-  char eof[8];
+  char eof[9];
   int pos = str->getPos();
-  str->setPos(7, -1);
+  str->setPos(8, -1);
   eof[0] = str->getChar();
   eof[1] = str->getChar();
   eof[2] = str->getChar();
@@ -125,10 +125,11 @@ GBool PDFDoc::setup(GString *ownerPassword, GString *userPassword) {
   eof[4] = str->getChar();
   eof[5] = str->getChar();
   eof[6] = str->getChar();
-  eof[7] = '\0';
+  eof[7] = str->getChar();
+  eof[8] = '\0';
   if (strstr(eof, "%%EOF") == NULL)
   {
-    error(-1, "Document does not have ending %%EOF");	      
+    error(-1, "Document does not have ending %%EOF");
     errCode = errDamaged;
     return gFalse;
   }