Use unique_ptr<CPDF_Object, ReleaseDeleter<>> in more places

core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

 // Copyright 2014 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/fpdf_edit/editint.h"
 
 #include <vector>
 
@@ skipping 796 matching lines @@
   offset += len;
   if (pFile->AppendString("/Length ") < 0)
     return FALSE;
 
   if ((len = pFile->AppendDWord(encoder.m_dwSize)) < 0)
     return FALSE;
 
   offset += len + 8;
   if (bEOF) {
     if ((len = PDF_CreatorWriteTrailer(pCreator->m_pDocument, pFile,
-                                       pCreator->m_pIDArray)) < 0) {
+                                       pCreator->m_pIDArray.get())) < 0) {
       return FALSE;
     }
     offset += len;
     if (pCreator->m_pEncryptDict) {
       uint32_t dwEncryptObjNum = pCreator->m_pEncryptDict->GetObjNum();
       if (dwEncryptObjNum == 0) {
         dwEncryptObjNum = pCreator->m_dwEncryptObjNum;
       }
       if ((len = PDF_CreatorWriteEncrypt(pCreator->m_pEncryptDict,
                                          dwEncryptObjNum, pFile)) < 0) {
@@ skipping 975 matching lines @@
         if (m_File.AppendBlock(offset_buf, FXSYS_strlen(offset_buf)) < 0) {
           return -1;
         }
       }
     }
     if (m_pIDArray) {
       if (m_File.AppendString(("/ID")) < 0) {
         return -1;
       }
       FX_FILESIZE offset = 0;
-      if (PDF_CreatorAppendObject(m_pIDArray, &m_File, offset) < 0) {
+      if (PDF_CreatorAppendObject(m_pIDArray.get(), &m_File, offset) < 0) {
         return -1;
       }
     }
     if (!bXRefStream) {
       if (m_File.AppendString(">>") < 0) {
         return -1;
       }
     } else {
       if (m_File.AppendString("/W[0 4 1]/Index[") < 0) {
         return -1;
@@ skipping 73 matching lines @@
     return -1;
   }
   m_File.Flush();
   return m_iStage = 100;
 }
 
 void CPDF_Creator::Clear() {
   m_pXRefStream.reset();
   m_File.Clear();
   m_NewObjNumArray.RemoveAll();
-  if (m_pIDArray) {
-    m_pIDArray->Release();
-    m_pIDArray = nullptr;
-  }
+  m_pIDArray.reset();
 }
 
 bool CPDF_Creator::Create(IFX_StreamWrite* pFile, uint32_t flags) {
   m_File.AttachFile(pFile);
   return Create(flags);
 }
 
 bool CPDF_Creator::Create(uint32_t flags) {
   m_dwFlags = flags;
   m_iStage = 0;
   m_Offset = 0;
   m_dwLastObjNum = m_pDocument->GetLastObjNum();
   m_ObjectOffset.Clear();
   m_NewObjNumArray.RemoveAll();
   InitID();
   if (flags & FPDFCREATE_PROGRESSIVE)
     return true;
   return Continue(nullptr) > -1;
 }
 
 void CPDF_Creator::InitID(FX_BOOL bDefault) {
   CPDF_Array* pOldIDArray = m_pParser ? m_pParser->GetIDArray() : nullptr;
   FX_BOOL bNewId = !m_pIDArray;
-  if (!m_pIDArray) {
-    m_pIDArray = new CPDF_Array;
+  if (bNewId) {
+    m_pIDArray.reset(new CPDF_Array);
     CPDF_Object* pID1 = pOldIDArray ? pOldIDArray->GetObjectAt(0) : nullptr;
     if (pID1) {
       m_pIDArray->Add(pID1->Clone());
     } else {
       std::vector<uint8_t> buffer =
           PDF_GenerateFileID((uint32_t)(uintptr_t) this, m_dwLastObjNum);
       CFX_ByteString bsBuffer(buffer.data(), buffer.size());
       m_pIDArray->Add(new CPDF_String(bsBuffer, TRUE));
     }
   }
@@ skipping 12 matching lines @@
     m_pIDArray->Add(new CPDF_String(bsBuffer, TRUE));
     return;
   }
   m_pIDArray->Add(m_pIDArray->GetObjectAt(0)->Clone());
   if (m_pEncryptDict && !pOldIDArray && m_pParser && bNewId) {
     if (m_pEncryptDict->GetStringFor("Filter") == "Standard") {
       CFX_ByteString user_pass = m_pParser->GetPassword();
       uint32_t flag = PDF_ENCRYPT_CONTENT;
 
       CPDF_SecurityHandler handler;
-      handler.OnCreate(m_pEncryptDict, m_pIDArray, user_pass.raw_str(),
+      handler.OnCreate(m_pEncryptDict, m_pIDArray.get(), user_pass.raw_str(),
                        user_pass.GetLength(), flag);
       if (m_bLocalCryptoHandler)
         delete m_pCryptoHandler;
       m_pCryptoHandler = new CPDF_CryptoHandler;
       m_pCryptoHandler->Init(m_pEncryptDict, &handler);
       m_bLocalCryptoHandler = TRUE;
       m_bSecurityChanged = TRUE;
     }
   }
 }
@@ skipping 37 matching lines @@
   m_pCryptoHandler = nullptr;
 }
 void CPDF_Creator::ResetStandardSecurity() {
   if (!m_bLocalCryptoHandler)
     return;
 
   delete m_pCryptoHandler;
   m_pCryptoHandler = nullptr;
   m_bLocalCryptoHandler = FALSE;
 }