Revert of Remove CPDF_Object::Release() in favor of direct delete

core/fpdfapi/parser/cpdf_array.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_array.h"
 
 #include <set>
 
 #include "core/fpdfapi/parser/cpdf_name.h"
 #include "core/fpdfapi/parser/cpdf_number.h"
 #include "core/fpdfapi/parser/cpdf_reference.h"
 #include "core/fpdfapi/parser/cpdf_stream.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "third_party/base/logging.h"
 #include "third_party/base/stl_util.h"
 
 CPDF_Array::CPDF_Array() {}
 
 CPDF_Array::~CPDF_Array() {
   // Mark the object as deleted so that it will not be deleted again
   // in case of cyclic references.
   m_ObjNum = kInvalidObjNum;
   for (auto& it : m_Objects) {
     if (it && it->GetObjNum() != kInvalidObjNum)
-      delete it;
+      it->Release();
   }
 }
 
 CPDF_Object::Type CPDF_Array::GetType() const {
   return ARRAY;
 }
 
 bool CPDF_Array::IsArray() const {
   return true;
 }
@@ skipping 94 matching lines @@
   return ToArray(GetDirectObjectAt(i));
 }
 
 void CPDF_Array::RemoveAt(size_t i, size_t nCount) {
   if (i >= m_Objects.size())
     return;
 
   if (nCount <= 0 || nCount > m_Objects.size() - i)
     return;
 
-  for (size_t j = 0; j < nCount; ++j)
-    delete m_Objects[i + j];
-
+  for (size_t j = 0; j < nCount; ++j) {
+    if (CPDF_Object* p = m_Objects[i + j])
+      p->Release();
+  }
   m_Objects.erase(m_Objects.begin() + i, m_Objects.begin() + i + nCount);
 }
 
 void CPDF_Array::ConvertToIndirectObjectAt(size_t i,
                                            CPDF_IndirectObjectHolder* pHolder) {
   if (i >= m_Objects.size())
     return;
 
   CPDF_Object* pObj = m_Objects[i];
   if (!pObj || pObj->IsReference())
     return;
 
   uint32_t dwObjNum = pHolder->AddIndirectObject(pObj);
   m_Objects[i] = new CPDF_Reference(pHolder, dwObjNum);
 }
 
 void CPDF_Array::SetAt(size_t i, CPDF_Object* pObj) {
   ASSERT(IsArray());
   CHECK(!pObj || pObj->IsInline());
   if (i >= m_Objects.size()) {
     ASSERT(false);
     return;
   }
-  delete m_Objects[i];
+  if (CPDF_Object* pOld = m_Objects[i])
+    pOld->Release();
+
   m_Objects[i] = pObj;
 }
 
 void CPDF_Array::InsertAt(size_t index, CPDF_Object* pObj) {
   ASSERT(IsArray());
   CHECK(!pObj || pObj->IsInline());
   if (index >= m_Objects.size()) {
     // Allocate space first.
     m_Objects.resize(index + 1, nullptr);
     m_Objects[index] = pObj;
@@ skipping 22 matching lines @@
 }
 
 void CPDF_Array::AddNumber(FX_FLOAT f) {
   Add(new CPDF_Number(f));
 }
 
 void CPDF_Array::AddReference(CPDF_IndirectObjectHolder* pDoc,
                               uint32_t objnum) {
   Add(new CPDF_Reference(pDoc, objnum));
 }