Make CPDF_Array not do indirect object creation.

fpdfsdk/fpdfsave.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_save.h"
 
 #include <vector>
 
@@ skipping 167 matching lines @@
       // Datasets
       pContext->UpdateChecksum(pDsfileWrite.get());
       pContext->FinishChecksum();
       CPDF_Dictionary* pDataDict = new CPDF_Dictionary;
       if (iDataSetsIndex != -1) {
         if (pDataSetsStream)
           pDataSetsStream->InitStreamFromFile(pDsfileWrite.get(), pDataDict);
       } else {
         CPDF_Stream* pData = new CPDF_Stream;
         pData->InitStreamFromFile(pDsfileWrite.get(), pDataDict);
-        pPDFDocument->AddIndirectObject(pData);
+        uint32_t objnum = pPDFDocument->AddIndirectObject(pData);
         iLast = pArray->GetCount() - 2;
         pArray->InsertAt(iLast, new CPDF_String("datasets", FALSE));
-        pArray->InsertAt(iLast + 1, pData, pPDFDocument);
+        pArray->InsertAt(iLast + 1, new CPDF_Reference(pPDFDocument, objnum));
       }
       fileList->push_back(std::move(pDsfileWrite));
     }
   }
   // L"form"
   {
     ScopedFileStream pfileWrite(FX_CreateMemoryStream());
     if (pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Form, pfileWrite.get(),
                                            pContext.get()) &&
         pfileWrite->GetSize() > 0) {
       CPDF_Dictionary* pDataDict = new CPDF_Dictionary;
       if (iFormIndex != -1) {
         if (pFormStream)
           pFormStream->InitStreamFromFile(pfileWrite.get(), pDataDict);
       } else {
         CPDF_Stream* pData = new CPDF_Stream;
         pData->InitStreamFromFile(pfileWrite.get(), pDataDict);
-        pPDFDocument->AddIndirectObject(pData);
+        uint32_t objnum = pPDFDocument->AddIndirectObject(pData);
         iLast = pArray->GetCount() - 2;
         pArray->InsertAt(iLast, new CPDF_String("form", FALSE));
-        pArray->InsertAt(iLast + 1, pData, pPDFDocument);
+        pArray->InsertAt(iLast + 1, new CPDF_Reference(pPDFDocument, objnum));
       }
       fileList->push_back(std::move(pfileWrite));
     }
   }
   return true;
 }
 
 bool SendPostSaveToXFADoc(CPDFXFA_Document* pDocument) {
   if (!pDocument)
     return false;
@@ skipping 85 matching lines @@
                                             FPDF_DWORD flags) {
   return FPDF_Doc_Save(document, pFileWrite, flags, FALSE, 0);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveWithVersion(FPDF_DOCUMENT document,
                                                  FPDF_FILEWRITE* pFileWrite,
                                                  FPDF_DWORD flags,
                                                  int fileVersion) {
   return FPDF_Doc_Save(document, pFileWrite, flags, TRUE, fileVersion);
 }