in the attempt to fix 627393, changed IFX_FileRead's readBlock to return the length it reads

fpdfsdk/include/fsdk_define.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h"
@@ skipping 15 matching lines @@
 class IFSDK_PAUSE_Adapter;
 
 class CPDF_CustomAccess final : public IFX_FileRead {
  public:
   explicit CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess);
   ~CPDF_CustomAccess() override {}
 
   // IFX_FileRead
   FX_FILESIZE GetSize() override;
   void Release() override;
-  FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
+  FX_BOOL IsEOF() override;
+  size_t ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
 
 #ifdef PDF_ENABLE_XFA
   virtual CFX_ByteString GetFullPath();
   virtual FX_BOOL GetByte(uint32_t pos, uint8_t& ch);
   virtual FX_BOOL GetBlock(uint32_t pos, uint8_t* pBuf, uint32_t size);
 #endif  // PDF_ENABLE_XFA
 
  private:
   FPDF_FILEACCESS m_FileAccess;
+  FX_FILESIZE m_nCurPos;
 #ifdef PDF_ENABLE_XFA
   uint8_t m_Buffer[512];
   uint32_t m_BufferOffset;
 #endif  // PDF_ENABLE_XFA
 };
 
 #ifdef PDF_ENABLE_XFA
 class CFPDF_FileStream : public IFX_FileStream {
  public:
   explicit CFPDF_FileStream(FPDF_FILEHANDLER* pFS);
   ~CFPDF_FileStream() override {}
 
   // IFX_FileStream:
   IFX_FileStream* Retain() override;
   void Release() override;
   FX_FILESIZE GetSize() override;
   FX_BOOL IsEOF() override;
   FX_FILESIZE GetPosition() override;
-  FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
+  size_t ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
   size_t ReadBlock(void* buffer, size_t size) override;
   FX_BOOL WriteBlock(const void* buffer,
                      FX_FILESIZE offset,
                      size_t size) override;
   FX_BOOL Flush() override;
 
   void SetPosition(FX_FILESIZE pos) { m_nCurPos = pos; }
 
  protected:
   FPDF_FILEHANDLER* m_pFS;
@@ skipping 37 matching lines @@
                             int rotate,
                             int flags,
                             FX_BOOL bNeedToRestore,
                             IFSDK_PAUSE_Adapter* pause);
 
 void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code);
 void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot);
 void ProcessParseError(CPDF_Parser::Error err);
 
 #endif  // FPDFSDK_INCLUDE_FSDK_DEFINE_H_