diff options
Diffstat (limited to 'core/fpdfapi')
-rw-r--r-- | core/fpdfapi/page/cpdf_contentparser.cpp | 70 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_contentparser.h | 6 |
2 files changed, 24 insertions, 52 deletions
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp index ec39858552..9e8f70ef18 100644 --- a/core/fpdfapi/page/cpdf_contentparser.cpp +++ b/core/fpdfapi/page/cpdf_contentparser.cpp @@ -16,7 +16,6 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" -#include "core/fxcrt/fx_safe_types.h" #include "core/fxcrt/pauseindicator_iface.h" #include "third_party/base/ptr_util.h" @@ -37,9 +36,11 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Page* pPage) CPDF_Stream* pStream = pContent->AsStream(); if (pStream) { - m_pSingleStream = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); - m_pSingleStream->LoadAllDataFiltered(); - m_CurrentStage = Stage::kPrepareContent; + RetainPtr<CPDF_StreamAcc> pSingleStream = + pdfium::MakeRetain<CPDF_StreamAcc>(pStream); + pSingleStream->LoadAllDataFiltered(); + m_StreamArray.push_back(pSingleStream); + m_CurrentStage = Stage::kParse; return; } @@ -104,11 +105,10 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Form* pForm, pState->SetFillAlpha(1.0f); pState->SetSoftMask(nullptr); } - m_pSingleStream = + RetainPtr<CPDF_StreamAcc> pSingleStream = pdfium::MakeRetain<CPDF_StreamAcc>(pForm->m_pFormStream.Get()); - m_pSingleStream->LoadAllDataFiltered(); - m_pData.Reset(m_pSingleStream->GetData()); - m_Size = m_pSingleStream->GetSize(); + pSingleStream->LoadAllDataFiltered(); + m_StreamArray.push_back(pSingleStream); } CPDF_ContentParser::~CPDF_ContentParser() {} @@ -123,9 +123,6 @@ bool CPDF_ContentParser::Continue(PauseIndicatorIface* pPause) { return true; } - if (m_CurrentStage == Stage::kPrepareContent) - m_CurrentStage = PrepareContent(); - while (m_CurrentStage == Stage::kParse) { m_CurrentStage = Parse(); if (pPause && pPause->NeedToPauseNow()) @@ -149,40 +146,12 @@ CPDF_ContentParser::Stage CPDF_ContentParser::GetContent() { m_StreamArray[m_CurrentOffset]->LoadAllDataFiltered(); m_CurrentOffset++; - return m_CurrentOffset == m_nStreams ? Stage::kPrepareContent - : Stage::kGetContent; -} - -CPDF_ContentParser::Stage CPDF_ContentParser::PrepareContent() { - m_CurrentOffset = 0; - - if (m_StreamArray.empty()) { - m_pData.Reset(m_pSingleStream->GetData()); - m_Size = m_pSingleStream->GetSize(); + if (m_CurrentOffset >= m_nStreams) { + m_CurrentOffset = 0; return Stage::kParse; } - FX_SAFE_UINT32 safeSize = 0; - for (const auto& stream : m_StreamArray) { - safeSize += stream->GetSize(); - safeSize += 1; - } - if (!safeSize.IsValid()) - return Stage::kComplete; - - m_Size = safeSize.ValueOrDie(); - m_pData.Reset( - std::unique_ptr<uint8_t, FxFreeDeleter>(FX_Alloc(uint8_t, m_Size))); - - uint32_t pos = 0; - for (const auto& stream : m_StreamArray) { - memcpy(m_pData.Get() + pos, stream->GetData(), stream->GetSize()); - pos += stream->GetSize(); - m_pData.Get()[pos++] = ' '; - } - m_StreamArray.clear(); - - return Stage::kParse; + return Stage::kGetContent; } CPDF_ContentParser::Stage CPDF_ContentParser::Parse() { @@ -195,12 +164,19 @@ CPDF_ContentParser::Stage CPDF_ContentParser::Parse() { nullptr, m_parsedSet.get()); m_pParser->GetCurStates()->m_ColorState.SetDefault(); } - if (m_CurrentOffset >= m_Size) - return Stage::kCheckClip; - m_CurrentOffset += - m_pParser->Parse(m_pData.Get() + m_CurrentOffset, - m_Size - m_CurrentOffset, PARSE_STEP_LIMIT); + m_CurrentOffset += m_pParser->Parse( + m_StreamArray[m_CurrentStream]->GetData() + m_CurrentOffset, + m_StreamArray[m_CurrentStream]->GetSize() - m_CurrentOffset, + PARSE_STEP_LIMIT); + + if (m_CurrentOffset >= m_StreamArray[m_CurrentStream]->GetSize()) { + m_CurrentOffset = 0; + ++m_CurrentStream; + if (m_CurrentStream >= m_nStreams) + return Stage::kCheckClip; + } + return Stage::kParse; } diff --git a/core/fpdfapi/page/cpdf_contentparser.h b/core/fpdfapi/page/cpdf_contentparser.h index f9b491defa..92a3e06890 100644 --- a/core/fpdfapi/page/cpdf_contentparser.h +++ b/core/fpdfapi/page/cpdf_contentparser.h @@ -42,26 +42,22 @@ class CPDF_ContentParser { private: enum class Stage : uint8_t { kGetContent = 1, - kPrepareContent, kParse, kCheckClip, kComplete, }; Stage GetContent(); - Stage PrepareContent(); Stage Parse(); Stage CheckClip(); Stage m_CurrentStage; UnownedPtr<CPDF_PageObjectHolder> const m_pObjectHolder; UnownedPtr<CPDF_Type3Char> m_pType3Char; // Only used when parsing forms. - RetainPtr<CPDF_StreamAcc> m_pSingleStream; std::vector<RetainPtr<CPDF_StreamAcc>> m_StreamArray; - MaybeOwned<uint8_t, FxFreeDeleter> m_pData; uint32_t m_nStreams = 0; - uint32_t m_Size = 0; uint32_t m_CurrentOffset = 0; + uint32_t m_CurrentStream = 0; // Only used when parsing pages. std::unique_ptr<std::set<const uint8_t*>> m_parsedSet; |