Add FX_OVERRIDE and use it for virtual functions of FX_FINAL classes.

fpdfsdk/src/fpdfview.cpp

 // 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
 
 #include "../include/fsdk_define.h"
 #include "../include/fpdfview.h"
 #include "../include/fsdk_rendercontext.h"
 #include "../include/fpdf_progressive.h"
 #include "../include/fpdf_ext.h"
 #include "../../third_party/numerics/safe_conversions_impl.h"
 
 CPDF_CustomAccess::CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess)

[jun_fang, 2014/08/08 22:16:41]

Need to check whether pFileAccess is valid(not NULL) before it's accessed?

[Tom Sepez, 2014/08/08 22:21:36]

Nah, the existing code seems to work.

 {
         m_FileAccess = *pFileAccess;
-        m_BufferOffset = (FX_DWORD)-1;
-}
-
-FX_BOOL CPDF_CustomAccess::GetByte(FX_DWORD pos, FX_BYTE& ch)
-{
-        if (pos >= m_FileAccess.m_FileLen) return FALSE;
-        if (m_BufferOffset == (FX_DWORD)-1 || pos < m_BufferOffset || pos >= m_BufferOffset + 512) {
-                // Need to read from file access
-                m_BufferOffset = pos;
-                int size = 512;
-                if (pos + 512 > m_FileAccess.m_FileLen)
-                        size = m_FileAccess.m_FileLen - pos;
-                if (!m_FileAccess.m_GetBlock(m_FileAccess.m_Param, m_BufferOffset, m_Buffer, size))
-                        return FALSE;
-        }
-        ch = m_Buffer[pos - m_BufferOffset];
-        return TRUE;
-}
-
-FX_BOOL CPDF_CustomAccess::GetBlock(FX_DWORD pos, FX_LPBYTE pBuf, FX_DWORD size)
-{
-    FX_SAFE_DWORD newPos = size;
-    newPos += pos;
-    if (!newPos.IsValid() || newPos.ValueOrDie() > m_FileAccess.m_FileLen) {
-        return FALSE;
-    }
-    return m_FileAccess.m_GetBlock(m_FileAccess.m_Param, pos, pBuf, size);
 }
 
 FX_BOOL CPDF_CustomAccess::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size)
 {
     if (offset < 0) {
         return FALSE;
     }
     FX_SAFE_FILESIZE newPos = base::checked_cast<FX_FILESIZE, size_t>(size);
     newPos += offset;
     if (!newPos.IsValid() || newPos.ValueOrDie() > m_FileAccess.m_FileLen) {
@@ skipping 854 matching lines @@
 {
         if (document == NULL)
                 return NULL;
         if (name == NULL || name[0] == 0) 
                 return NULL;
 
         CPDF_Document* pDoc = (CPDF_Document*)document;
         CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
         return name_tree.LookupNamedDest(pDoc, name);
 }