Use std::map in CPDF_IndirectObjects

core/src/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/src/fpdfapi/fpdf_edit/editint.h"
 
 #include <vector>
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
 #include "core/include/fpdfapi/fpdf_parser.h"
+#include "third_party/base/stl_util.h"
 
 #define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024)
 #define PDF_XREFSTREAM_MAXSIZE 10000
 
 // TODO(ochang): Make helper for appending "objnum 0 R ".
 
 namespace {
 
 int32_t PDF_CreatorAppendObject(const CPDF_Object* pObj,
                                 CFX_FileBufferArchive* pFile,
@@ skipping 1252 matching lines @@
       break;
     }
   }
   return 1;
 }
 int32_t CPDF_Creator::WriteOldIndirectObject(FX_DWORD objnum) {
   if (m_pParser->m_V5Type[objnum] == 0 || m_pParser->m_V5Type[objnum] == 255) {
     return 0;
   }
   m_ObjectOffset[objnum] = m_Offset;
-  void* valuetemp = NULL;
   FX_BOOL bExistInMap =
-      m_pDocument->m_IndirectObjs.Lookup((void*)(uintptr_t)objnum, valuetemp);
+      pdfium::ContainsKey(m_pDocument->m_IndirectObjs, objnum);
   FX_BOOL bObjStm =
       (m_pParser->m_V5Type[objnum] == 2) && m_pEncryptDict && !m_pXRefStream;
   if (m_pParser->m_bVersionUpdated || m_bSecurityChanged || bExistInMap ||
       bObjStm) {
     CPDF_Object* pObj = m_pDocument->GetIndirectObject(objnum, nullptr);
     if (!pObj) {
       m_ObjectOffset[objnum] = 0;
       return 0;
     }
     if (WriteIndirectObj(pObj)) {
@@ skipping 65 matching lines @@
       return 1;
     }
   }
   return 0;
 }
 int32_t CPDF_Creator::WriteNewObjs(FX_BOOL bIncremental, IFX_Pause* pPause) {
   int32_t iCount = m_NewObjNumArray.GetSize();
   int32_t index = (int32_t)(uintptr_t)m_Pos;
   while (index < iCount) {
     FX_DWORD objnum = m_NewObjNumArray.ElementAt(index);
-    CPDF_Object* pObj = NULL;
-    m_pDocument->m_IndirectObjs.Lookup((void*)(uintptr_t)objnum, (void*&)pObj);
-    if (NULL == pObj) {
+    auto it = m_pDocument->m_IndirectObjs.find(objnum);
+    if (it == m_pDocument->m_IndirectObjs.end()) {
       ++index;
       continue;
     }
     m_ObjectOffset[objnum] = m_Offset;
-    if (WriteIndirectObj(pObj)) {
+    if (WriteIndirectObj(it->second)) {
       return -1;
     }
     index++;
     if (pPause && pPause->NeedToPauseNow()) {
       m_Pos = (FX_POSITION)(uintptr_t)index;
       return 1;
     }
   }
   return 0;
 }
@@ skipping 17 matching lines @@
            m_pParser->m_V5Type[j] != 255) {
       j++;
     }
     m_ObjectOffset.Add(dwStart, j - dwStart);
     dwStart = j;
   }
 }
 void CPDF_Creator::InitNewObjNumOffsets() {
   FX_BOOL bIncremental = (m_dwFlags & FPDFCREATE_INCREMENTAL) != 0;
   FX_BOOL bNoOriginal = (m_dwFlags & FPDFCREATE_NO_ORIGINAL) != 0;
-  FX_POSITION pos = m_pDocument->m_IndirectObjs.GetStartPosition();
-  while (pos) {
-    size_t key = 0;
-    CPDF_Object* pObj;
-    m_pDocument->m_IndirectObjs.GetNextAssoc(pos, (void*&)key, (void*&)pObj);
-    FX_DWORD objnum = (FX_DWORD)key;
-    if (pObj->GetObjNum() == -1) {
+  for (const auto& pair : m_pDocument->m_IndirectObjs) {
+    if (pair.second->GetObjNum() == -1)
+      continue;
+    if (bIncremental) {
+      if (!pair.second->IsModified())
+        continue;
+    } else if (m_pParser && m_pParser->IsValidObjectNumber(pair.first) &&
+               m_pParser->m_V5Type[pair.first]) {
       continue;
     }
-    if (bIncremental) {
-      if (!pObj->IsModified()) {
-        continue;
-      }
-    } else if (m_pParser && m_pParser->IsValidObjectNumber(objnum) &&
-               m_pParser->m_V5Type[objnum]) {
-      continue;
-    }
-    AppendNewObjNum(objnum);
+    AppendNewObjNum(pair.first);
   }
   int32_t iCount = m_NewObjNumArray.GetSize();
   if (iCount == 0) {
     return;
   }
   int32_t i = 0;
   FX_DWORD dwStartObjNum = 0;
   FX_BOOL bCrossRefValid = m_pParser && m_pParser->GetLastXRefOffset() > 0;
   while (i < iCount) {
     dwStartObjNum = m_NewObjNumArray.ElementAt(i);
@@ skipping 639 matching lines @@
   m_bNewCrypto = FALSE;
   if (!m_bStandardSecurity) {
     return;
   }
   if (m_pEncryptDict) {
     m_pEncryptDict->Release();
     m_pEncryptDict = NULL;
   }
   m_bStandardSecurity = FALSE;
 }