Return unique_ptr from CPDF_Object::Clone().

core/fpdfapi/parser/cpdf_parser.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/parser/cpdf_parser.h"
 
 #include <vector>
 
@@ skipping 719 matching lines @@
                     ParseIndirectObjectAtByStrict(m_pDocument, obj_pos, objnum,
                                                   &obj_end);
                 if (CPDF_Stream* pStream = ToStream(pObject.get())) {
                   if (CPDF_Dictionary* pDict = pStream->GetDict()) {
                     if ((pDict->KeyExist("Type")) &&
                         (pDict->GetStringFor("Type") == "XRef" &&
                          pDict->KeyExist("Size"))) {
                       CPDF_Object* pRoot = pDict->GetObjectFor("Root");
                       if (pRoot && pRoot->GetDict() &&
                           pRoot->GetDict()->GetObjectFor("Pages")) {
-                        m_pTrailer =
-                            ToDictionary(pdfium::WrapUnique(pDict->Clone()));
+                        m_pTrailer = ToDictionary(pDict->Clone());
                       }
                     }
                   }
                 }
 
                 FX_FILESIZE offset = 0;
                 m_pSyntax->RestorePos(obj_pos);
                 offset = m_pSyntax->FindTag("obj", 0);
                 if (offset == -1)
                   offset = 0;
@@ skipping 52 matching lines @@
                         while (it != pTrailer->end()) {
                           const CFX_ByteString& key = it->first;
                           CPDF_Object* pElement = it->second;
                           ++it;
                           uint32_t dwObjNum =
                               pElement ? pElement->GetObjNum() : 0;
                           if (dwObjNum) {
                             m_pTrailer->SetReferenceFor(key, m_pDocument,
                                                         dwObjNum);
                           } else {
-                            m_pTrailer->SetFor(key, pElement->Clone());
+                            m_pTrailer->SetFor(key,
+                                               pElement->Clone().release());
                           }
                         }
                       }
                     } else {
                       if (pObj->IsStream()) {
-                        m_pTrailer =
-                            ToDictionary(pdfium::WrapUnique(pTrailer->Clone()));
+                        m_pTrailer = ToDictionary(pTrailer->Clone());
                       } else {
                         m_pTrailer = ToDictionary(std::move(pObj));
                       }
 
                       FX_FILESIZE dwSavePos = m_pSyntax->SavePos();
                       CFX_ByteString strWord = m_pSyntax->GetKeyword();
                       if (!strWord.Compare("startxref")) {
                         bool bNumber;
                         CFX_ByteString bsOffset =
                             m_pSyntax->GetNextWord(&bNumber);
@@ skipping 120 matching lines @@
   CPDF_Stream* pStream = pUnownedObject->AsStream();
   if (!pStream)
     return false;
 
   CPDF_Dictionary* pDict = pStream->GetDict();
   *pos = pDict->GetIntegerFor("Prev");
   int32_t size = pDict->GetIntegerFor("Size");
   if (size < 0)
     return false;
 
-  std::unique_ptr<CPDF_Dictionary> pNewTrailer =
-      ToDictionary(pdfium::WrapUnique(pDict->Clone()));
+  std::unique_ptr<CPDF_Dictionary> pNewTrailer = ToDictionary(pDict->Clone());
   if (bMainXRef) {
     m_pTrailer = std::move(pNewTrailer);
     ShrinkObjectMap(size);
     for (auto& it : m_ObjectInfo)
       it.second.type = 0;
   } else {
     m_Trailers.push_back(std::move(pNewTrailer));
   }
 
   std::vector<std::pair<int32_t, int32_t>> arrIndex;
@@ skipping 598 matching lines @@
   if (!LoadLinearizedAllCrossRefV4(m_LastXRefOffset, m_dwXrefStartObjNum) &&
       !LoadLinearizedAllCrossRefV5(m_LastXRefOffset)) {
     m_LastXRefOffset = 0;
     m_pSyntax->m_MetadataObjnum = dwSaveMetadataObjnum;
     return FORMAT_ERROR;
   }
 
   m_pSyntax->m_MetadataObjnum = dwSaveMetadataObjnum;
   return SUCCESS;
 }