From b850c987d141c5578535faba64d14782dbfc13da Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 13 Aug 2018 19:08:58 +0000 Subject: Move CPDFSDK_MemoryAccess to fxcrt. Rename it CFX_ReadOnlyMemoryStream and swap out one use of CFX_MemoryStream. BUG=pdfium:263 Change-Id: I15012df156a6a4d7c36f6fd58f32c355eae5fa1a Reviewed-on: https://pdfium-review.googlesource.com/39878 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- BUILD.gn | 4 ++-- core/fpdfdoc/cpdf_metadata.cpp | 6 +++--- core/fxcrt/cfx_readonlymemorystream.cpp | 34 +++++++++++++++++++++++++++++++++ core/fxcrt/cfx_readonlymemorystream.h | 30 +++++++++++++++++++++++++++++ fpdfsdk/cpdfsdk_memoryaccess.cpp | 32 ------------------------------- fpdfsdk/cpdfsdk_memoryaccess.h | 29 ---------------------------- fpdfsdk/fpdf_view.cpp | 4 ++-- 7 files changed, 71 insertions(+), 68 deletions(-) create mode 100644 core/fxcrt/cfx_readonlymemorystream.cpp create mode 100644 core/fxcrt/cfx_readonlymemorystream.h delete mode 100644 fpdfsdk/cpdfsdk_memoryaccess.cpp delete mode 100644 fpdfsdk/cpdfsdk_memoryaccess.h diff --git a/BUILD.gn b/BUILD.gn index f08ce43225..c3576b49b4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -131,8 +131,6 @@ jumbo_static_library("pdfium") { "fpdfsdk/cpdfsdk_helpers.h", "fpdfsdk/cpdfsdk_interform.cpp", "fpdfsdk/cpdfsdk_interform.h", - "fpdfsdk/cpdfsdk_memoryaccess.cpp", - "fpdfsdk/cpdfsdk_memoryaccess.h", "fpdfsdk/cpdfsdk_pageview.cpp", "fpdfsdk/cpdfsdk_pageview.h", "fpdfsdk/cpdfsdk_widget.cpp", @@ -852,6 +850,8 @@ jumbo_static_library("fxcrt") { "core/fxcrt/cfx_fixedbufgrow.h", "core/fxcrt/cfx_memorystream.cpp", "core/fxcrt/cfx_memorystream.h", + "core/fxcrt/cfx_readonlymemorystream.cpp", + "core/fxcrt/cfx_readonlymemorystream.h", "core/fxcrt/cfx_seekablemultistream.cpp", "core/fxcrt/cfx_seekablemultistream.h", "core/fxcrt/cfx_seekablestreamproxy.cpp", diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp index 5ef7312752..b9a92963dd 100644 --- a/core/fpdfdoc/cpdf_metadata.cpp +++ b/core/fpdfdoc/cpdf_metadata.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" -#include "core/fxcrt/cfx_memorystream.h" +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmlelement.h" @@ -67,8 +67,8 @@ std::vector CPDF_Metadata::CheckForSharedForm() const { auto pAcc = pdfium::MakeRetain(stream_.Get()); pAcc->LoadAllDataFiltered(); - auto stream = pdfium::MakeRetain(pAcc->GetData(), - pAcc->GetSize(), false); + auto stream = pdfium::MakeRetain(pAcc->GetData(), + pAcc->GetSize()); CFX_XMLParser parser(stream); std::unique_ptr doc = parser.Parse(); if (!doc) diff --git a/core/fxcrt/cfx_readonlymemorystream.cpp b/core/fxcrt/cfx_readonlymemorystream.cpp new file mode 100644 index 0000000000..1d09759208 --- /dev/null +++ b/core/fxcrt/cfx_readonlymemorystream.cpp @@ -0,0 +1,34 @@ +// Copyright 2018 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/fxcrt/cfx_readonlymemorystream.h" + +#include "core/fxcrt/fx_safe_types.h" + +CFX_ReadOnlyMemoryStream::CFX_ReadOnlyMemoryStream(const uint8_t* pBuf, + FX_FILESIZE size) + : m_pBuf(pBuf), m_size(size) {} + +CFX_ReadOnlyMemoryStream::~CFX_ReadOnlyMemoryStream() = default; + +FX_FILESIZE CFX_ReadOnlyMemoryStream::GetSize() { + return m_size; +} + +bool CFX_ReadOnlyMemoryStream::ReadBlock(void* buffer, + FX_FILESIZE offset, + size_t size) { + if (offset < 0) + return false; + + FX_SAFE_FILESIZE newPos = pdfium::base::checked_cast(size); + newPos += offset; + if (!newPos.IsValid() || newPos.ValueOrDie() > m_size) + return false; + + memcpy(buffer, m_pBuf + offset, size); + return true; +} diff --git a/core/fxcrt/cfx_readonlymemorystream.h b/core/fxcrt/cfx_readonlymemorystream.h new file mode 100644 index 0000000000..e9d18222a4 --- /dev/null +++ b/core/fxcrt/cfx_readonlymemorystream.h @@ -0,0 +1,30 @@ +// Copyright 2018 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 CORE_FXCRT_CFX_READONLYMEMORYSTREAM_H_ +#define CORE_FXCRT_CFX_READONLYMEMORYSTREAM_H_ + +#include "core/fxcrt/fx_stream.h" +#include "core/fxcrt/retain_ptr.h" + +class CFX_ReadOnlyMemoryStream final : public IFX_SeekableReadStream { + public: + template + friend RetainPtr pdfium::MakeRetain(Args&&... args); + + // IFX_SeekableReadStream: + FX_FILESIZE GetSize() override; + bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override; + + private: + CFX_ReadOnlyMemoryStream(const uint8_t* pBuf, FX_FILESIZE size); + ~CFX_ReadOnlyMemoryStream() override; + + const uint8_t* const m_pBuf; + const FX_FILESIZE m_size; +}; + +#endif // CORE_FXCRT_CFX_READONLYMEMORYSTREAM_H_ diff --git a/fpdfsdk/cpdfsdk_memoryaccess.cpp b/fpdfsdk/cpdfsdk_memoryaccess.cpp deleted file mode 100644 index 2a5b7aed00..0000000000 --- a/fpdfsdk/cpdfsdk_memoryaccess.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2018 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 "fpdfsdk/cpdfsdk_memoryaccess.h" - -CPDFSDK_MemoryAccess::CPDFSDK_MemoryAccess(const uint8_t* pBuf, - FX_FILESIZE size) - : m_pBuf(pBuf), m_size(size) {} - -CPDFSDK_MemoryAccess::~CPDFSDK_MemoryAccess() = default; - -FX_FILESIZE CPDFSDK_MemoryAccess::GetSize() { - return m_size; -} - -bool CPDFSDK_MemoryAccess::ReadBlock(void* buffer, - FX_FILESIZE offset, - size_t size) { - if (offset < 0) - return false; - - FX_SAFE_FILESIZE newPos = pdfium::base::checked_cast(size); - newPos += offset; - if (!newPos.IsValid() || newPos.ValueOrDie() > m_size) - return false; - - memcpy(buffer, m_pBuf + offset, size); - return true; -} diff --git a/fpdfsdk/cpdfsdk_memoryaccess.h b/fpdfsdk/cpdfsdk_memoryaccess.h deleted file mode 100644 index ed9c80acb5..0000000000 --- a/fpdfsdk/cpdfsdk_memoryaccess.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2018 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_CPDFSDK_MEMORYACCESS_H_ -#define FPDFSDK_CPDFSDK_MEMORYACCESS_H_ - -#include "core/fxcrt/fx_stream.h" - -class CPDFSDK_MemoryAccess final : public IFX_SeekableReadStream { - public: - template - friend RetainPtr pdfium::MakeRetain(Args&&... args); - - // IFX_SeekableReadStream: - FX_FILESIZE GetSize() override; - bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override; - - private: - CPDFSDK_MemoryAccess(const uint8_t* pBuf, FX_FILESIZE size); - ~CPDFSDK_MemoryAccess() override; - - const uint8_t* const m_pBuf; - const FX_FILESIZE m_size; -}; - -#endif // FPDFSDK_CPDFSDK_MEMORYACCESS_H_ diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp index c44d582fd0..bd8cfe1e25 100644 --- a/fpdfsdk/fpdf_view.cpp +++ b/fpdfsdk/fpdf_view.cpp @@ -26,6 +26,7 @@ #include "core/fpdfdoc/cpdf_nametree.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfdoc/cpdf_viewerpreferences.h" +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/unowned_ptr.h" @@ -35,7 +36,6 @@ #include "fpdfsdk/cpdfsdk_customaccess.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_helpers.h" -#include "fpdfsdk/cpdfsdk_memoryaccess.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/ipdfsdk_pauseadapter.h" #include "fxjs/ijs_runtime.h" @@ -269,7 +269,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDF_LoadXFA(FPDF_DOCUMENT document) { FPDF_EXPORT FPDF_DOCUMENT FPDF_CALLCONV FPDF_LoadMemDocument(const void* data_buf, int size, FPDF_BYTESTRING password) { - return LoadDocumentImpl(pdfium::MakeRetain( + return LoadDocumentImpl(pdfium::MakeRetain( static_cast(data_buf), size), password); } -- cgit v1.2.3