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

fpdfsdk/fpdfsave.cpp

Index: fpdfsdk/fpdfsave.cpp
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index c9043249e1c7ddfcbba51e0ea54cdf284aeabe4b..82baf6bedc011468dd5885ea61dc751c1058e2b6 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -174,14 +174,16 @@ bool SaveXFADocumentData(CPDFXFA_Context* pContext,
       // 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,
@@ -196,14 +198,15 @@ bool SaveXFADocumentData(CPDFXFA_Context* pContext,
     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,