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

core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp

Index: core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
index 7a08511e816586f0821dfa5d9d447b706f462a9a..3cfc82f5cbdc5fbdb5865661486d7a1f1a75aaef 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
@@ -16,25 +16,28 @@
 class CFX_TestBufferRead : public IFX_FileRead {
  public:
   CFX_TestBufferRead(const unsigned char* buffer_in, size_t buf_size)
-      : buffer_(buffer_in), total_size_(buf_size) {}
+      : buffer_(buffer_in), total_size_(buf_size), m_nCurPos(0) {}
 
   // IFX_Stream
   void Release() override { delete this; }
 
   // IFX_FileRead
-  FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override {
+  FX_BOOL IsEOF() override { return m_nCurPos >= total_size_; }

[Tom Sepez, 2016/10/19 23:12:47]

nit: can we make this just a |bool|, we've been trying to reduce dependence of
FX_BOOL.

[Tom Sepez, 2016/10/19 23:12:48]

We may get a signed vs unsigned comparison error on some compilers.

+
+  size_t ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override {
     if (offset < 0 || offset + size > total_size_) {
-      return FALSE;
+      return 0;
     }
-
     memcpy(buffer, buffer_ + offset, size);
-    return TRUE;
+    m_nCurPos = offset + size;
+    return size;
   }
   FX_FILESIZE GetSize() override { return (FX_FILESIZE)total_size_; };
 
  protected:
   const unsigned char* buffer_;
   size_t total_size_;

[Tom Sepez, 2016/10/19 23:12:47]

|total_size_| probably needs to be a FX_FILESIZE as well, to skirt the
signed/unsigned comparison above.

+  FX_FILESIZE m_nCurPos;

[Tom Sepez, 2016/10/19 23:12:47]

nit: use pre-existing convention, eg. current_pos_

 };
 
 // A wrapper class to help test member functions of CPDF_Parser.