Remove next batch of CFX_ arrays from fpdf_edit_doc.cpp

core/fpdfapi/fpdf_edit/fpdf_edit_doc.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 <limits.h>
 
+#include <set>
 #include <vector>
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h"
@@ skipping 982 matching lines @@
   pFontDesc->SetAtInteger("StemV", nStemV);
   AddIndirectObject(pFontDesc);
   pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
   return LoadFont(pBaseDict);
 }
 static int InsertDeletePDFPage(CPDF_Document* pDoc,
                                CPDF_Dictionary* pPages,
                                int nPagesToGo,
                                CPDF_Dictionary* pPage,
                                FX_BOOL bInsert,
-                               CFX_ArrayTemplate<CPDF_Dictionary*>& stackList) {
+                               std::set<CPDF_Dictionary*>* pVisited) {
   CPDF_Array* pKidList = pPages->GetArrayBy("Kids");
-  if (!pKidList) {
+  if (!pKidList)
     return -1;
-  }
+
   for (size_t i = 0; i < pKidList->GetCount(); i++) {
     CPDF_Dictionary* pKid = pKidList->GetDictAt(i);
     if (pKid->GetStringBy("Type") == "Page") {
       if (nPagesToGo == 0) {
         if (bInsert) {
           pKidList->InsertAt(i, new CPDF_Reference(pDoc, pPage->GetObjNum()));
           pPage->SetAtReference("Parent", pDoc, pPages->GetObjNum());
         } else {
           pKidList->RemoveAt(i);
         }
         pPages->SetAtInteger(
             "Count", pPages->GetIntegerBy("Count") + (bInsert ? 1 : -1));
         return 1;
       }
       nPagesToGo--;
     } else {
       int nPages = pKid->GetIntegerBy("Count");
       if (nPagesToGo < nPages) {
-        int stackCount = stackList.GetSize();
-        for (int j = 0; j < stackCount; ++j) {
-          if (pKid == stackList[j]) {
-            return -1;
-          }
-        }
-        stackList.Add(pKid);
+        if (pdfium::ContainsValue(*pVisited, pKid))
+          return -1;
+        pdfium::ScopedSetInsertion<CPDF_Dictionary*>(pVisited, pKid);
         if (InsertDeletePDFPage(pDoc, pKid, nPagesToGo, pPage, bInsert,
-                                stackList) < 0) {
+                                pVisited) < 0) {
           return -1;
         }
-        stackList.RemoveAt(stackCount);
         pPages->SetAtInteger(
             "Count", pPages->GetIntegerBy("Count") + (bInsert ? 1 : -1));
         return 1;
       }
       nPagesToGo -= nPages;
     }
   }
   return 0;
 }
 static int InsertNewPage(CPDF_Document* pDoc,
@@ skipping 15 matching lines @@
   if (iPage == nPages) {
     CPDF_Array* pPagesList = pPages->GetArrayBy("Kids");
     if (!pPagesList) {
       pPagesList = new CPDF_Array;
       pPages->SetAt("Kids", pPagesList);
     }
     pPagesList->Add(pPageDict, pDoc);
     pPages->SetAtInteger("Count", nPages + 1);
     pPageDict->SetAtReference("Parent", pDoc, pPages->GetObjNum());
   } else {
-    CFX_ArrayTemplate<CPDF_Dictionary*> stack;
-    stack.Add(pPages);
-    if (InsertDeletePDFPage(pDoc, pPages, iPage, pPageDict, TRUE, stack) < 0) {
+    std::set<CPDF_Dictionary*> stack = {pPages};
+    if (InsertDeletePDFPage(pDoc, pPages, iPage, pPageDict, TRUE, &stack) < 0)
       return -1;
-    }
   }
   pageList.InsertAt(iPage, pPageDict->GetObjNum());
   return iPage;
 }
 CPDF_Dictionary* CPDF_Document::CreateNewPage(int iPage) {
   CPDF_Dictionary* pDict = new CPDF_Dictionary;
   pDict->SetAtName("Type", "Page");
   uint32_t dwObjNum = AddIndirectObject(pDict);
   if (InsertNewPage(this, iPage, pDict, m_PageList) < 0) {
     ReleaseIndirectObject(dwObjNum);
     return NULL;
   }
   return pDict;
 }
 
 CPDF_Font* CPDF_Document::AddStandardFont(const FX_CHAR* font,
                                           CPDF_FontEncoding* pEncoding) {
   CFX_ByteString name(font);
   if (PDF_GetStandardFontName(&name) < 0)
     return nullptr;
   return GetPageData()->GetStandardFont(name.AsStringC(), pEncoding);
 }
 
 void CPDF_Document::DeletePage(int iPage) {
   CPDF_Dictionary* pRoot = GetRoot();
-  if (!pRoot) {
+  if (!pRoot)
     return;
-  }
+
   CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
-  if (!pPages) {
+  if (!pPages)
     return;
-  }
+
   int nPages = pPages->GetIntegerBy("Count");
-  if (iPage < 0 || iPage >= nPages) {
+  if (iPage < 0 || iPage >= nPages)
     return;
-  }
-  CFX_ArrayTemplate<CPDF_Dictionary*> stack;
-  stack.Add(pPages);
-  if (InsertDeletePDFPage(this, pPages, iPage, NULL, FALSE, stack) < 0) {
+
+  std::set<CPDF_Dictionary*> stack = {pPages};
+  if (InsertDeletePDFPage(this, pPages, iPage, nullptr, FALSE, &stack) < 0)
     return;
-  }
+
   m_PageList.RemoveAt(iPage);
 }
 
 void FPDFAPI_FlatPageAttr(CPDF_Dictionary* pPageDict,
                           const CFX_ByteStringC& name) {
   if (pPageDict->KeyExist(name)) {
     return;
   }
   CPDF_Object* pObj = FPDFAPI_GetPageAttr(pPageDict, name);
   if (pObj) {
     pPageDict->SetAt(name, pObj->Clone());
   }
 }