diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-04-12 16:50:51 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-13 06:00:01 +0000 |
| commit | e0b592236db902e3e8cbca7ec64f8e2b192e1935 (patch) | |
| tree | c77a5264e2a2f35c454471941045d3ccb0fe1172 /core/fpdfapi/parser/cpdf_syntax_parser.cpp | |
| parent | d20e3880234a35a558237316cac5d70fff4224bc (diff) | |
| download | pdfium-chromium/3076.tar.xz | |
Refcount CPDF_CryptoHandlerchromium/3076chromium/3075chromium/3074chromium/3073chromium/3072
Avoid tracking ownership via m_bLocalCryptoHandler.
Also remove m_bEncryptCloned, as it is always false.
Replace some methods with direct calls to underlying code.
Change-Id: Ifa9d6f721c59d07e3b8e258f76832ca9f2ea0fc9
Reviewed-on: https://pdfium-review.googlesource.com/4111
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_syntax_parser.cpp')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_syntax_parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp index 1c84b859db..ecf2cf6e5b 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp +++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp @@ -635,7 +635,7 @@ std::unique_ptr<CPDF_Stream> CPDF_SyntaxParser::ReadStream( const CFX_ByteStringC kEndObjStr("endobj"); CPDF_CryptoHandler* pCryptoHandler = - objnum == m_MetadataObjnum ? nullptr : m_pCryptoHandler.get(); + objnum == m_MetadataObjnum ? nullptr : m_pCryptoHandler.Get(); if (!pCryptoHandler) { bool bSearchForKeyword = true; if (len >= 0) { @@ -911,6 +911,6 @@ FX_FILESIZE CPDF_SyntaxParser::FindTag(const CFX_ByteStringC& tag, } void CPDF_SyntaxParser::SetEncrypt( - std::unique_ptr<CPDF_CryptoHandler> pCryptoHandler) { - m_pCryptoHandler = std::move(pCryptoHandler); + const CFX_RetainPtr<CPDF_CryptoHandler>& pCryptoHandler) { + m_pCryptoHandler = pCryptoHandler; } |