Replace CPDF_SortObjNumArray with a std::set.

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 "parser_int.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 2799 matching lines @@
   FX_FILESIZE m_dwTrailerOffset;
 
   FX_FILESIZE m_dwCurrentOffset;
 
   PDF_DATAAVAIL_STATUS m_docStatus;
 
   FX_FILESIZE m_dwFileLen;
 
   CPDF_Document* m_pDocument;
 
-  CPDF_SortObjNumArray m_objnum_array;
+  std::set<FX_DWORD> m_objnum_set;

[Tom Sepez, 2016/01/06 00:49:56]

nit: the naming convention for a class that is directly a member seems to be
m_ObjectSet (with caps but no hungarian prefix character), but this is
inconsistent (see m_parser above for example).

[Lei Zhang, 2016/01/06 00:52:26]

m_ObjectSet it is.

 
   CFX_ArrayTemplate<CPDF_Object*> m_objs_array;
 
   FX_FILESIZE m_Pos;
 
   FX_FILESIZE m_bufferOffset;
 
   FX_DWORD m_bufferSize;
 
   CFX_ByteString m_WordBuf;
@@ skipping 221 matching lines @@
         CPDF_Reference* pRef = pObj->AsReference();
         FX_DWORD dwNum = pRef->GetRefObjNum();
         FX_FILESIZE offset;
         FX_DWORD size = GetObjectSize(dwNum, offset);
         if (size == 0 || offset < 0 || offset >= m_dwFileLen) {
           break;
         }
         if (!IsDataAvail(offset, size, pHints)) {
           ret_array.Add(pObj);
           count++;
-        } else if (!m_objnum_array.Find(dwNum)) {
-          m_objnum_array.AddObjNum(dwNum);
+        } else if (!pdfium::ContainsKey(m_objnum_set, dwNum)) {
+          m_objnum_set.insert(dwNum);
           CPDF_Object* pReferred =
               m_pDocument->GetIndirectObject(pRef->GetRefObjNum(), NULL);
           if (pReferred) {
             new_obj_array.Add(pReferred);
           }
         }
       } break;
     }
   }
   if (count > 0) {
     int32_t iSize = new_obj_array.GetSize();
     for (i = 0; i < iSize; ++i) {
       CPDF_Object* pObj = new_obj_array[i];
       if (CPDF_Reference* pRef = pObj->AsReference()) {
         FX_DWORD dwNum = pRef->GetRefObjNum();
-        if (!m_objnum_array.Find(dwNum))
+        if (!pdfium::ContainsKey(m_objnum_set, dwNum))
           ret_array.Add(pObj);
       } else {
         ret_array.Add(pObj);
       }
     }
     return FALSE;
   }
   obj_array.RemoveAll();
   obj_array.Append(new_obj_array);
   return IsObjectsAvail(obj_array, FALSE, pHints, ret_array);
@@ skipping 11 matching lines @@
     if (!CheckDocStatus(pHints)) {
       return DataNotAvailable;
     }
   }
   return DataAvailable;
 }
 
 FX_BOOL CPDF_DataAvail::CheckAcroFormSubObject(IFX_DownloadHints* pHints) {
   if (!m_objs_array.GetSize()) {
     m_objs_array.RemoveAll();
-    m_objnum_array.RemoveAll();
+    m_objnum_set.clear();
     CFX_ArrayTemplate<CPDF_Object*> obj_array;
     obj_array.Append(m_arrayAcroforms);
     FX_BOOL bRet = IsObjectsAvail(obj_array, FALSE, pHints, m_objs_array);
     if (bRet) {
       m_objs_array.RemoveAll();
     }
     return bRet;
   }
   CFX_ArrayTemplate<CPDF_Object*> new_objs_array;
   FX_BOOL bRet = IsObjectsAvail(m_objs_array, FALSE, pHints, new_objs_array);
@@ skipping 1185 matching lines @@
     m_bMainXRefLoadedOK = TRUE;
     m_bLinearedDataOK = TRUE;
   }
 
   return m_bLinearedDataOK ? DataAvailable : DataNotAvailable;
 }
 FX_BOOL CPDF_DataAvail::CheckPageAnnots(int32_t iPage,
                                         IFX_DownloadHints* pHints) {
   if (!m_objs_array.GetSize()) {
     m_objs_array.RemoveAll();
-    m_objnum_array.RemoveAll();
+    m_objnum_set.clear();
     CPDF_Dictionary* pPageDict = m_pDocument->GetPage(iPage);
     if (!pPageDict) {
       return TRUE;
     }
     CPDF_Object* pAnnots = pPageDict->GetElement("Annots");
     if (!pAnnots) {
       return TRUE;
     }
     CFX_ArrayTemplate<CPDF_Object*> obj_array;
     obj_array.Add(pAnnots);
@@ skipping 49 matching lines @@
 int CPDF_DataAvail::IsPageAvail(int32_t iPage, IFX_DownloadHints* pHints) {
   if (!m_pDocument) {
     return DataError;
   }
   if (IsFirstCheck(iPage)) {
     m_bCurPageDictLoadOK = FALSE;
     m_bPageLoadedOK = FALSE;
     m_bAnnotsLoad = FALSE;
     m_bNeedDownLoadResource = FALSE;
     m_objs_array.RemoveAll();
-    m_objnum_array.RemoveAll();
+    m_objnum_set.clear();
   }
   if (pdfium::ContainsKey(m_pagesLoadState, iPage))
     return DataAvailable;
 
   if (m_bLinearized) {
     if ((FX_DWORD)iPage == m_dwFirstPageNo) {
       if (!CheckLinearizedFirstPage(iPage, pHints))
         return DataNotAvailable;
       m_pagesLoadState.insert(iPage);
       return DataAvailable;
@@ skipping 36 matching lines @@
   }
   if (m_bHaveAcroForm && !m_bAcroFormLoad) {
     if (!CheckAcroFormSubObject(pHints)) {
       return DataNotAvailable;
     }
     m_bAcroFormLoad = TRUE;
   }
   if (!m_bPageLoadedOK) {
     if (!m_objs_array.GetSize()) {
       m_objs_array.RemoveAll();
-      m_objnum_array.RemoveAll();
+      m_objnum_set.clear();
       m_pPageDict = m_pDocument->GetPage(iPage);
       if (!m_pPageDict) {
         ResetFirstCheck(iPage);
         return DataAvailable;
       }
       CFX_ArrayTemplate<CPDF_Object*> obj_array;
       obj_array.Add(m_pPageDict);
       FX_BOOL bRet = IsObjectsAvail(obj_array, TRUE, pHints, m_objs_array);
       if (bRet) {
         m_objs_array.RemoveAll();
@@ skipping 133 matching lines @@
   }
   CFX_ArrayTemplate<CPDF_Object*> new_objs_array;
   FX_BOOL bRet = IsObjectsAvail(m_objs_array, FALSE, pHints, new_objs_array);
   m_objs_array.RemoveAll();
   if (!bRet) {
     m_objs_array.Append(new_objs_array);
     return FormNotAvailable;
   }
   return FormAvailable;
 }
-void CPDF_SortObjNumArray::AddObjNum(FX_DWORD dwObjNum) {
-  int32_t iNext = 0;
-  if (BinarySearch(dwObjNum, iNext)) {
-    return;
-  }
-  m_number_array.InsertAt(iNext, dwObjNum);
-}
-FX_BOOL CPDF_SortObjNumArray::Find(FX_DWORD dwObjNum) {
-  int32_t iNext = 0;
-  return BinarySearch(dwObjNum, iNext);
-}
-FX_BOOL CPDF_SortObjNumArray::BinarySearch(FX_DWORD value, int32_t& iNext) {
-  int32_t iLow = 0;
-  int32_t iHigh = m_number_array.GetSize() - 1;
-  while (iLow <= iHigh) {
-    int32_t iMid = (iLow + iHigh) / 2;
-    if (m_number_array.GetAt(iMid) == value) {
-      iNext = iMid;
-      return TRUE;
-    }
-    if (m_number_array.GetAt(iMid) > value) {
-      iHigh = iMid - 1;
-    } else if (m_number_array.GetAt(iMid) < value) {
-      iLow = iMid + 1;
-    }
-  }
-  iNext = iLow;
-  return FALSE;
-}
+
 CPDF_PageNode::~CPDF_PageNode() {
   for (int32_t i = 0; i < m_childNode.GetSize(); ++i) {
     delete m_childNode[i];
   }
   m_childNode.RemoveAll();
 }
 CPDF_HintTables::~CPDF_HintTables() {
   m_dwDeltaNObjsArray.RemoveAll();
   m_dwNSharedObjsArray.RemoveAll();
   m_dwSharedObjNumArray.RemoveAll();
@@ skipping 360 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();
 }