Merge pull request #1420 from ONLYOFFICE/fix/bug66504

Fix bug 66504
ONLYOFFICE · Feb 15, 2024 · e11f145 · e11f145
2 parents 7710090 + 5c69cb0
commit e11f145
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/PdfFile/lib/xpdf/Stream.cc b/PdfFile/lib/xpdf/Stream.cc
@@ -989,7 +989,9 @@ void MemStream::setPos(GFileOffset pos, int dir) {
   } else {
     i = (Guint)(start + length - pos);
   }
-  if (i < start) {
+  if (dir < 0 && start + length < pos) {
+    i = 0;
+  } else if (i < start) {
     i = start;
   } else if (i > start + length) {
     i = start + length;

diff --git a/PdfFile/lib/xpdf/XRef.cc b/PdfFile/lib/xpdf/XRef.cc
@@ -419,12 +419,12 @@ GFileOffset XRef::getStartXref() {
   nTry = 1;
   bFind = false;
 
-  do {
+  bool isBreak = false;
+  do
+  {
     str->setPos(xrefSearchSize * nTry, -1);
+    isBreak = str->getPos() == 0;
     n = str->getBlock(buf, xrefSearchSize);
-    if (n <= 0) {
-      break;
-    }
     buf[n] = '\0';
 
     // find startxref
@@ -439,7 +439,7 @@ GFileOffset XRef::getStartXref() {
       break;
     }
     nTry++;
-  } while (str->getPos() > 0);
+  } while (!isBreak);
 
   // read last xrefSearchSize bytes