diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-11-04 08:25:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-04 08:25:34 -0700 |
| commit | f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3 (patch) | |
| tree | edc3d5f35225971679e581c8ef951de8275a944b /core/fpdfapi/page/fpdf_page_parser_old.cpp | |
| parent | 4de3d095c9d9e961f93750cf1ebd489fd515be12 (diff) | |
| download | pdfium-f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3.tar.xz | |
Revert of Remove CPDF_Object::Release() in favor of direct delete (patchset #11 id:200001 of https://codereview.chromium.org/2384883003/ )
Reason for revert:
Looks like it's blocking the roll.
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_compile_dbg_ng/builds/186619
Original issue's description:
> Remove CPDF_Object::Release() in favor of direct delete
>
> Follow-on once we prove Release always deletes in previous CL.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/4de3d095c9d9e961f93750cf1ebd489fd515be12
TBR=thestig@chromium.org,tsepez@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2478253002
Diffstat (limited to 'core/fpdfapi/page/fpdf_page_parser_old.cpp')
| -rw-r--r-- | core/fpdfapi/page/fpdf_page_parser_old.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/fpdfapi/page/fpdf_page_parser_old.cpp b/core/fpdfapi/page/fpdf_page_parser_old.cpp index 51ffc11b03..0d1db43825 100644 --- a/core/fpdfapi/page/fpdf_page_parser_old.cpp +++ b/core/fpdfapi/page/fpdf_page_parser_old.cpp @@ -138,7 +138,9 @@ CPDF_StreamParser::CPDF_StreamParser( m_pPool(pPool) {} CPDF_StreamParser::~CPDF_StreamParser() { - delete m_pLastObj; + if (m_pLastObj) { + m_pLastObj->Release(); + } } CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc, @@ -250,8 +252,10 @@ CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc, } CPDF_StreamParser::SyntaxType CPDF_StreamParser::ParseNextElement() { - delete m_pLastObj; - m_pLastObj = nullptr; + if (m_pLastObj) { + m_pLastObj->Release(); + m_pLastObj = nullptr; + } m_WordSize = 0; bool bIsNumber = true; @@ -370,7 +374,7 @@ CPDF_Object* CPDF_StreamParser::ReadNextObject(bool bAllowNestedArray, break; if (!m_WordSize || m_WordBuffer[0] != '/') { - delete pDict; + pDict->Release(); return nullptr; } @@ -378,12 +382,12 @@ CPDF_Object* CPDF_StreamParser::ReadNextObject(bool bAllowNestedArray, PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1)); CPDF_Object* pObj = ReadNextObject(true, 0); if (!pObj) { - delete pDict; + pDict->Release(); return nullptr; } if (key.IsEmpty()) - delete pObj; + pObj->Release(); else pDict->SetFor(key, pObj); } |