| Index: core/fpdfapi/parser/cpdf_syntax_parser.cpp
|
| diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
|
| index 6a3db602860adfaacc3be4bd82dcce808b7d874e..17739c67e66f760d8d2fd2e7ef8d36e71f85907e 100644
|
| --- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp
|
| +++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
|
| @@ -402,13 +402,13 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObject(
|
| CFX_ByteString str = ReadString();
|
| if (m_pCryptoHandler && bDecrypt)
|
| m_pCryptoHandler->Decrypt(objnum, gennum, str);
|
| - return pdfium::MakeUnique<CPDF_String>(MaybeIntern(str), false);
|
| + return pdfium::MakeUnique<CPDF_String>(m_pPool, str, false);
|
| }
|
| if (word == "<") {
|
| CFX_ByteString str = ReadHexString();
|
| if (m_pCryptoHandler && bDecrypt)
|
| m_pCryptoHandler->Decrypt(objnum, gennum, str);
|
| - return pdfium::MakeUnique<CPDF_String>(MaybeIntern(str), true);
|
| + return pdfium::MakeUnique<CPDF_String>(m_pPool, str, true);
|
| }
|
| if (word == "[") {
|
| std::unique_ptr<CPDF_Array> pArray = pdfium::MakeUnique<CPDF_Array>();
|
| @@ -419,8 +419,9 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObject(
|
| return std::move(pArray);
|
| }
|
| if (word[0] == '/') {
|
| - return pdfium::MakeUnique<CPDF_Name>(MaybeIntern(
|
| - PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1))));
|
| + return pdfium::MakeUnique<CPDF_Name>(
|
| + m_pPool,
|
| + PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1)));
|
| }
|
| if (word == "<<") {
|
| int32_t nKeys = 0;
|
| @@ -522,13 +523,13 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectForStrict(
|
| CFX_ByteString str = ReadString();
|
| if (m_pCryptoHandler)
|
| m_pCryptoHandler->Decrypt(objnum, gennum, str);
|
| - return pdfium::MakeUnique<CPDF_String>(MaybeIntern(str), false);
|
| + return pdfium::MakeUnique<CPDF_String>(m_pPool, str, false);
|
| }
|
| if (word == "<") {
|
| CFX_ByteString str = ReadHexString();
|
| if (m_pCryptoHandler)
|
| m_pCryptoHandler->Decrypt(objnum, gennum, str);
|
| - return pdfium::MakeUnique<CPDF_String>(MaybeIntern(str), true);
|
| + return pdfium::MakeUnique<CPDF_String>(m_pPool, str, true);
|
| }
|
| if (word == "[") {
|
| std::unique_ptr<CPDF_Array> pArray = pdfium::MakeUnique<CPDF_Array>();
|
| @@ -539,8 +540,9 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectForStrict(
|
| return m_WordBuffer[0] == ']' ? std::move(pArray) : nullptr;
|
| }
|
| if (word[0] == '/') {
|
| - return pdfium::MakeUnique<CPDF_Name>(MaybeIntern(
|
| - PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1))));
|
| + return pdfium::MakeUnique<CPDF_Name>(
|
| + m_pPool,
|
| + PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1)));
|
| }
|
| if (word == "<<") {
|
| std::unique_ptr<CPDF_Dictionary> pDict =
|
|
|