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

core/fxge/android/cfpf_skiafontmgr.cpp

 // Copyright 2016 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
 
 #include "core/fxge/android/cfpf_skiafontmgr.h"
 
 #define FPF_SKIAMATCHWEIGHT_NAME1 62
 #define FPF_SKIAMATCHWEIGHT_NAME2 60
@@ skipping 15 matching lines @@
 #endif
 static unsigned long FPF_SkiaStream_Read(FXFT_Stream stream,
                                          unsigned long offset,
                                          unsigned char* buffer,
                                          unsigned long count) {
   IFX_SeekableReadStream* pFileRead =
       (IFX_SeekableReadStream*)stream->descriptor.pointer;
   if (!pFileRead)
     return 0;
   if (count > 0) {
-    if (!pFileRead->ReadBlock(buffer, (FX_FILESIZE)offset, (size_t)count))
+    unsigned long readSize = static_cast<unsigned long>(
+        pFileRead->ReadBlock(buffer, (FX_FILESIZE)offset, (size_t)count));
+    if (readSize != count && !pFileRead->IsEOF()) {
       return 0;
   }
-  return count;
+  return readSize;

[Tom Sepez, 2016/11/16 18:32:01]

readSize has gone out of scope. Did this compile?

 }
 
 static void FPF_SkiaStream_Close(FXFT_Stream stream) {}
 #ifdef __cplusplus
 };
 #endif
 
 namespace {
 
 struct FPF_SKIAFONTMAP {
@@ skipping 424 matching lines @@
       if ((uSerif > 1 && uSerif < 10) || uSerif > 13)
         pFontDesc->m_dwStyle |= FXFONT_SERIF;
     }
   }
   if (pOS2 && (pOS2->ulCodePageRange1 & (1 << 31)))
     pFontDesc->m_dwStyle |= FXFONT_SYMBOLIC;
   pFontDesc->m_dwCharsets = FPF_SkiaGetFaceCharset(pOS2);
   pFontDesc->m_iFaceIndex = face->face_index;
   pFontDesc->m_iGlyphNum = face->num_glyphs;
 }