Make CPDF_Stream() take unique_ptr's to its dictionary.

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 156 matching lines @@
   }
   // L"datasets"
   {
     ScopedFileStream pDsfileWrite(FX_CreateMemoryStream());
     if (pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Datasets,
                                            pDsfileWrite.get(), nullptr) &&
         pDsfileWrite->GetSize() > 0) {
       // Datasets
       pChecksum->UpdateChecksum(pDsfileWrite.get());
       pChecksum->FinishChecksum();
-      CPDF_Dictionary* pDataDict =
-          new CPDF_Dictionary(pPDFDocument->GetByteStringPool());
+      auto pDataDict = pdfium::MakeUnique<CPDF_Dictionary>(
+          pPDFDocument->GetByteStringPool());
       if (iDataSetsIndex != -1) {
-        if (pDataSetsStream)
-          pDataSetsStream->InitStreamFromFile(pDsfileWrite.get(), pDataDict);
+        if (pDataSetsStream) {
+          pDataSetsStream->InitStreamFromFile(pDsfileWrite.get(),
+                                              std::move(pDataDict));
+        }
       } else {
         CPDF_Stream* pData = pPDFDocument->NewIndirect<CPDF_Stream>();
-        pData->InitStreamFromFile(pDsfileWrite.get(), pDataDict);
+        pData->InitStreamFromFile(pDsfileWrite.get(), std::move(pDataDict));
         iLast = pArray->GetCount() - 2;
         pArray->InsertNewAt<CPDF_String>(iLast, "datasets", false);
         pArray->InsertNewAt<CPDF_Reference>(iLast + 1, pPDFDocument,
                                             pData->GetObjNum());
       }
       fileList->push_back(std::move(pDsfileWrite));
     }
   }
   // L"form"
   {
     ScopedFileStream pfileWrite(FX_CreateMemoryStream());
     if (pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Form, pfileWrite.get(),
                                            pChecksum.get()) &&
         pfileWrite->GetSize() > 0) {
-      CPDF_Dictionary* pDataDict =
-          new CPDF_Dictionary(pPDFDocument->GetByteStringPool());
+      auto pDataDict = pdfium::MakeUnique<CPDF_Dictionary>(
+          pPDFDocument->GetByteStringPool());
       if (iFormIndex != -1) {
         if (pFormStream)

[Lei Zhang, 2016/11/18 23:50:34]

curly braces, like line 180.

[Tom Sepez, 2016/11/19 00:05:16]

Done.

-          pFormStream->InitStreamFromFile(pfileWrite.get(), pDataDict);
+          pFormStream->InitStreamFromFile(pfileWrite.get(),
+                                          std::move(pDataDict));
       } else {
         CPDF_Stream* pData = pPDFDocument->NewIndirect<CPDF_Stream>();
-        pData->InitStreamFromFile(pfileWrite.get(), pDataDict);
+        pData->InitStreamFromFile(pfileWrite.get(), std::move(pDataDict));
         iLast = pArray->GetCount() - 2;
         pArray->InsertNewAt<CPDF_String>(iLast, "form", false);
         pArray->InsertNewAt<CPDF_Reference>(iLast + 1, pPDFDocument,
                                             pData->GetObjNum());
       }
       fileList->push_back(std::move(pfileWrite));
     }
   }
   return true;
 }
@@ skipping 89 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);
 }