Make CPDF_Dictionary use unique pointers.

core/fpdfapi/page/cpdf_streamparser.cpp

 // Copyright 2016 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/fpdfapi/page/pageint.h"
 
 #include <limits.h>
 
@@ skipping 212 matching lines @@
         m_Pos = dwPrevPos;
         break;
       }
       dwStreamSize += m_Pos - dwPrevPos;
     }
     m_Pos = dwSavePos;
     pData = FX_Alloc(uint8_t, dwStreamSize);
     FXSYS_memcpy(pData, m_pBuf + m_Pos, dwStreamSize);
     m_Pos += dwStreamSize;
   }
-  pDict->SetIntegerFor("Length", (int)dwStreamSize);
+  pDict->SetNewFor<CPDF_Number>("Length", (int)dwStreamSize);
   return new CPDF_Stream(pData, dwStreamSize, pDict);
 }
 
 CPDF_StreamParser::SyntaxType CPDF_StreamParser::ParseNextElement() {
   delete m_pLastObj;
   m_pLastObj = nullptr;
 
   m_WordSize = 0;
   bool bIsNumber = true;
   if (!PositionIsInBounds())
@@ skipping 97 matching lines @@
 
   if (first_char == '(') {
     CFX_ByteString str = ReadString();
     return new CPDF_String(m_pPool, str, false);
   }
 
   if (first_char == '<') {
     if (m_WordSize == 1)
       return new CPDF_String(m_pPool, ReadHexString(), true);
 
     CPDF_Dictionary* pDict = new CPDF_Dictionary(m_pPool);

[Lei Zhang, 2016/11/18 04:14:20]

For later: unique_ptr.

     while (1) {
       GetNextWord(bIsNumber);
       if (m_WordSize == 2 && m_WordBuffer[0] == '>')
         break;
 
       if (!m_WordSize || m_WordBuffer[0] != '/') {
         delete pDict;
         return nullptr;
       }
 
       CFX_ByteString key =
           PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1));
-      CPDF_Object* pObj = ReadNextObject(true, 0);
+      auto pObj = pdfium::WrapUnique(ReadNextObject(true, 0));
       if (!pObj) {
         delete pDict;
         return nullptr;
       }
-
-      if (key.IsEmpty())
-        delete pObj;
-      else
-        pDict->SetFor(key, pObj);
+      if (!key.IsEmpty())
+        pDict->SetFor(key, std::move(pObj));
     }
     return pDict;
   }
 
   if (first_char == '[') {
     if ((!bAllowNestedArray && dwInArrayLevel) ||
         dwInArrayLevel > kMaxNestedArrayLevel) {
       return nullptr;
     }
 
@@ skipping 233 matching lines @@
 
   if (buf.GetLength() > kMaxStringLength)
     return CFX_ByteString(buf.GetBuffer(), kMaxStringLength);
 
   return buf.MakeString();
 }
 
 bool CPDF_StreamParser::PositionIsInBounds() const {
   return m_Pos < m_Size;
 }