Replace more CFX_MapPtrToPtr and remove it.

core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.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/include/fpdfapi/fpdf_parser.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 143 matching lines @@
   if (m_pTrailer) {
     m_pTrailer->Release();
     m_pTrailer = NULL;
   }
   ReleaseEncryptHandler();
   SetEncryptDictionary(NULL);
   if (m_bOwnFileRead && m_Syntax.m_pFileAccess) {
     m_Syntax.m_pFileAccess->Release();
     m_Syntax.m_pFileAccess = NULL;
   }
-  FX_POSITION pos = m_ObjectStreamMap.GetStartPosition();
-  while (pos) {
-    void* objnum;
-    CPDF_StreamAcc* pStream;
-    m_ObjectStreamMap.GetNextAssoc(pos, objnum, (void*&)pStream);
-    delete pStream;
-  }
-  m_ObjectStreamMap.RemoveAll();
+  m_ObjectStreamMap.clear();
   m_ObjCache.clear();
 
   m_SortedOffset.RemoveAll();
   m_ObjectInfo.clear();
   m_V5Type.RemoveAll();
   m_ObjVersion.RemoveAll();
   int32_t iLen = m_Trailers.GetSize();
   for (int32_t i = 0; i < iLen; ++i) {
     if (CPDF_Dictionary* trailer = m_Trailers.GetAt(i))
       trailer->Release();
@@ skipping 427 matching lines @@
   while (xrefpos) {
     seen_xrefpos.insert(xrefpos);
     if (!LoadCrossRefV5(&xrefpos, FALSE)) {
       return FALSE;
     }
     // Check for circular references.
     if (pdfium::ContainsKey(seen_xrefpos, xrefpos)) {
       return FALSE;
     }
   }
-  m_ObjectStreamMap.InitHashTable(101, FALSE);
+  m_ObjectStreamMap.clear();
   m_bXRefStream = TRUE;
   return TRUE;
 }
 
 FX_BOOL CPDF_Parser::RebuildCrossRef() {
   m_ObjectInfo.clear();
   m_V5Type.RemoveAll();
   m_SortedOffset.RemoveAll();
   m_ObjVersion.RemoveAll();
   if (m_pTrailer) {
@@ skipping 615 matching lines @@
 
   const auto it = m_ObjCache[pObjStream].find(objnum);
   if (it == m_ObjCache[pObjStream].end())
     return nullptr;
 
   syntax.RestorePos(offset + it->second);
   return syntax.GetObject(pObjList, 0, 0, pContext, true);
 }
 
 CPDF_StreamAcc* CPDF_Parser::GetObjectStream(FX_DWORD objnum) {
-  CPDF_StreamAcc* pStreamAcc = nullptr;
-  if (m_ObjectStreamMap.Lookup((void*)(uintptr_t)objnum, (void*&)pStreamAcc))
-    return pStreamAcc;
+  auto it = m_ObjectStreamMap.find(objnum);
+  if (it != m_ObjectStreamMap.end())
+    return it->second.get();
 
   const CPDF_Stream* pStream = ToStream(
       m_pDocument ? m_pDocument->GetIndirectObject(objnum, nullptr) : nullptr);
   if (!pStream)
     return nullptr;
 
-  pStreamAcc = new CPDF_StreamAcc;
+  CPDF_StreamAcc* pStreamAcc = new CPDF_StreamAcc;
   pStreamAcc->LoadAllData(pStream);
-  m_ObjectStreamMap.SetAt((void*)(uintptr_t)objnum, pStreamAcc);
+  m_ObjectStreamMap[objnum].reset(pStreamAcc);
   return pStreamAcc;
 }
 
 FX_FILESIZE CPDF_Parser::GetObjectSize(FX_DWORD objnum) const {
   if (!IsValidObjectNumber(objnum))
     return 0;
 
   if (m_V5Type[objnum] == 2)
     objnum = GetObjectPositionOrZero(objnum);
 
@@ skipping 387 matching lines @@
   while (xrefpos) {
     seen_xrefpos.insert(xrefpos);
     if (!LoadCrossRefV5(&xrefpos, FALSE)) {
       return FALSE;
     }
     // Check for circular references.
     if (pdfium::ContainsKey(seen_xrefpos, xrefpos)) {
       return FALSE;
     }
   }
-  m_ObjectStreamMap.InitHashTable(101, FALSE);
+  m_ObjectStreamMap.clear();
   m_bXRefStream = TRUE;
   return TRUE;
 }
 FX_DWORD CPDF_Parser::LoadLinearizedMainXRefTable() {
   FX_DWORD dwSaveMetadataObjnum = m_Syntax.m_MetadataObjnum;
   m_Syntax.m_MetadataObjnum = 0;
   if (m_pTrailer) {
     m_pTrailer->Release();
     m_pTrailer = NULL;
   }
   m_Syntax.RestorePos(m_LastXRefOffset - m_Syntax.m_HeaderOffset);
   uint8_t ch = 0;
   FX_DWORD dwCount = 0;
   m_Syntax.GetNextChar(ch);
   while (PDFCharIsWhitespace(ch)) {
     ++dwCount;
     if (m_Syntax.m_FileLen >=
         (FX_FILESIZE)(m_Syntax.SavePos() + m_Syntax.m_HeaderOffset)) {
       break;
     }
     m_Syntax.GetNextChar(ch);
   }
   m_LastXRefOffset += dwCount;
-  FX_POSITION pos = m_ObjectStreamMap.GetStartPosition();
-  while (pos) {
-    void* objnum;
-    CPDF_StreamAcc* pStream;
-    m_ObjectStreamMap.GetNextAssoc(pos, objnum, (void*&)pStream);
-    delete pStream;
-  }
-  m_ObjectStreamMap.RemoveAll();
+  m_ObjectStreamMap.clear();
   m_ObjCache.clear();
 
   if (!LoadLinearizedAllCrossRefV4(m_LastXRefOffset, m_dwXrefStartObjNum) &&
       !LoadLinearizedAllCrossRefV5(m_LastXRefOffset)) {
     m_LastXRefOffset = 0;
     m_Syntax.m_MetadataObjnum = dwSaveMetadataObjnum;
     return PDFPARSE_ERROR_FORMAT;
   }
   FXSYS_qsort(m_SortedOffset.GetData(), m_SortedOffset.GetSize(),
               sizeof(FX_FILESIZE), CompareFileSize);
@@ skipping 3278 matching lines @@
   if (!m_pLinearizedDict)
     return -1;
   CPDF_Array* pRange = m_pLinearizedDict->GetArray("H");
   if (!pRange)
     return -1;
   CPDF_Object* pStreamLen = pRange->GetElementValue(1);
   if (!pStreamLen)
     return -1;
   return pStreamLen->GetInteger();
 }