Use string pools in some dictionaries

fpdfsdk/fpdf_flatten.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 "public/fpdf_flatten.h"
 
 #include <algorithm>
 
@@ skipping 176 matching lines @@
                      CPDF_Document* pDocument) {
   CPDF_Object* pContentsObj = pPage->GetStreamFor("Contents");
   if (!pContentsObj) {
     pContentsObj = pPage->GetArrayFor("Contents");
   }
 
   if (!pContentsObj) {
     // Create a new contents dictionary
     if (!key.IsEmpty()) {
       CPDF_Stream* pNewContents =
-          new CPDF_Stream(nullptr, 0, new CPDF_Dictionary);
+          new CPDF_Stream(nullptr, 0, new CPDF_Dictionary(pDocument));
       pPage->SetReferenceFor("Contents", pDocument,
                              pDocument->AddIndirectObject(pNewContents));
 
       CFX_ByteString sStream;
       sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
       pNewContents->SetData(sStream.raw_str(), sStream.GetLength(), FALSE,
                             FALSE);
     }
     return;
   }
 
   CPDF_Array* pContentsArray = nullptr;
-
   switch (pContentsObj->GetType()) {
     case CPDF_Object::STREAM: {
       pContentsArray = new CPDF_Array;
       CPDF_Stream* pContents = pContentsObj->AsStream();
       uint32_t dwObjNum = pDocument->AddIndirectObject(pContents);
       CPDF_StreamAcc acc;
       acc.LoadAllData(pContents);
       CFX_ByteString sStream = "q\n";
       CFX_ByteString sBody =
           CFX_ByteString((const FX_CHAR*)acc.GetData(), acc.GetSize());
@@ skipping 12 matching lines @@
   }
 
   if (!pContentsArray)
     return;
 
   uint32_t dwObjNum = pDocument->AddIndirectObject(pContentsArray);
   pPage->SetReferenceFor("Contents", pDocument, dwObjNum);
 
   if (!key.IsEmpty()) {
     CPDF_Stream* pNewContents =
-        new CPDF_Stream(nullptr, 0, new CPDF_Dictionary);
+        new CPDF_Stream(nullptr, 0, new CPDF_Dictionary(pDocument));
     dwObjNum = pDocument->AddIndirectObject(pNewContents);
     pContentsArray->AddReference(pDocument, dwObjNum);
 
     CFX_ByteString sStream;
     sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
     pNewContents->SetData(sStream.raw_str(), sStream.GetLength(), FALSE, FALSE);
   }
 }
 
 CFX_Matrix GetMatrix(CFX_FloatRect rcAnnot,
@@ skipping 112 matching lines @@
     CPDF_Array* pCropBox = new CPDF_Array();
     pCropBox->Add(new CPDF_Number(rcOriginalCB.left));
     pCropBox->Add(new CPDF_Number(rcOriginalCB.bottom));
     pCropBox->Add(new CPDF_Number(rcOriginalCB.right));
     pCropBox->Add(new CPDF_Number(rcOriginalCB.top));
     pPageDict->SetFor("ArtBox", pCropBox);
   }
 
   CPDF_Dictionary* pRes = pPageDict->GetDictFor("Resources");
   if (!pRes) {
-    pRes = new CPDF_Dictionary;
+    pRes = new CPDF_Dictionary(pDocument);

[dsinclair, 2016/09/19 13:24:34]

Reading through these, I think see 

  pRes = new CPDF_Dictionary(pDocument->pool())

would be a lot clearer as to what we're passing into the dictionary.

[Tom Sepez, 2016/09/19 18:24:59]

Done.

     pPageDict->SetFor("Resources", pRes);
   }
 
-  CPDF_Stream* pNewXObject = new CPDF_Stream(nullptr, 0, new CPDF_Dictionary);
+  CPDF_Stream* pNewXObject =
+      new CPDF_Stream(nullptr, 0, new CPDF_Dictionary(pDocument));
+
   uint32_t dwObjNum = pDocument->AddIndirectObject(pNewXObject);
   CPDF_Dictionary* pPageXObject = pRes->GetDictFor("XObject");
   if (!pPageXObject) {
-    pPageXObject = new CPDF_Dictionary;
+    pPageXObject = new CPDF_Dictionary(pDocument);
     pRes->SetFor("XObject", pPageXObject);
   }
 
   CFX_ByteString key = "";
   int nStreams = ObjectArray.GetSize();
 
   if (nStreams > 0) {
     for (int iKey = 0; /*iKey < 100*/; iKey++) {
       char sExtend[5] = {};
       FXSYS_itoa(iKey, sExtend, 10);
       key = CFX_ByteString("FFT") + CFX_ByteString(sExtend);
       if (!pPageXObject->KeyExist(key))
         break;
     }
   }
 
   SetPageContents(key, pPageDict, pDocument);
 
   CPDF_Dictionary* pNewXORes = nullptr;
 
   if (!key.IsEmpty()) {
     pPageXObject->SetReferenceFor(key, pDocument, dwObjNum);
     CPDF_Dictionary* pNewOXbjectDic = pNewXObject->GetDict();
-    pNewXORes = new CPDF_Dictionary;
+    pNewXORes = new CPDF_Dictionary(pDocument);
     pNewOXbjectDic->SetFor("Resources", pNewXORes);
     pNewOXbjectDic->SetNameFor("Type", "XObject");
     pNewOXbjectDic->SetNameFor("Subtype", "Form");
     pNewOXbjectDic->SetIntegerFor("FormType", 1);
     pNewOXbjectDic->SetNameFor("Name", "FRM");
     CFX_FloatRect rcBBox = pPageDict->GetRectFor("ArtBox");
     pNewOXbjectDic->SetRectFor("BBox", rcBBox);
   }
 
   for (int i = 0; i < nStreams; i++) {
@@ skipping 51 matching lines @@
     if (pObj) {
       CPDF_Dictionary* pObjDic = pObj->GetDict();
       if (pObjDic) {
         pObjDic->SetNameFor("Type", "XObject");
         pObjDic->SetNameFor("Subtype", "Form");
       }
     }
 
     CPDF_Dictionary* pXObject = pNewXORes->GetDictFor("XObject");
     if (!pXObject) {
-      pXObject = new CPDF_Dictionary;
+      pXObject = new CPDF_Dictionary(pDocument);
       pNewXORes->SetFor("XObject", pXObject);
     }
 
     CFX_ByteString sFormName;
     sFormName.Format("F%d", i);
     uint32_t dwStreamObjNum = pDocument->AddIndirectObject(pObj);
     pXObject->SetReferenceFor(sFormName, pDocument, dwStreamObjNum);
 
     CPDF_StreamAcc acc;
     acc.LoadAllData(pNewXObject);
@@ skipping 17 matching lines @@
     sStream += sTemp;
     pNewXObject->SetData(sStream.raw_str(), sStream.GetLength(), FALSE, FALSE);
   }
   pPageDict->RemoveFor("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }