RefCount CPDF_StreamAcc all the time.

Pass stream argument to constructor; it feels like a
stream accessor should always be made from a stream rather
than passing one in after the fact.

Change-Id: Iaa46cb37677b81f0170f5d39bab76ad38ea4af44
Reviewed-on: https://pdfium-review.googlesource.com/3620
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index 6894f8c2ed..004c921a52 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -137,12 +137,10 @@ bool SaveXFADocumentData(
   // template
   if (iTemplate > -1) {
     CPDF_Stream* pTemplateStream = pArray->GetStreamAt(iTemplate);
-    CPDF_StreamAcc streamAcc;
-    streamAcc.LoadAllData(pTemplateStream);
-    uint8_t* pData = (uint8_t*)streamAcc.GetData();
-    uint32_t dwSize2 = streamAcc.GetSize();
-    CFX_RetainPtr<IFX_SeekableStream> pTemplate =
-        IFX_MemoryStream::Create(pData, dwSize2);
+    auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pTemplateStream);
+    pAcc->LoadAllData();
+    CFX_RetainPtr<IFX_SeekableStream> pTemplate = IFX_MemoryStream::Create(
+        const_cast<uint8_t*>(pAcc->GetData()), pAcc->GetSize());
     pChecksum->UpdateChecksum(pTemplate);
   }
   CPDF_Stream* pFormStream = nullptr;