diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-09-21 18:11:47 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-21 18:11:47 +0000 |
| commit | 8e54f192f977824744cd14f04b6f35b79e0c42be (patch) | |
| tree | 749b6a2b446eadeab251155b65e2c93443370b18 /fpdfsdk/fpdf_flatten.cpp | |
| parent | 214982c4d02a720c3b1b3de121cddc62189b8848 (diff) | |
| download | pdfium-8e54f192f977824744cd14f04b6f35b79e0c42be.tar.xz | |
Fix destruction order with CPDF_StreamAcc.
Commit d39389f6 changed CPDF_StreamAcc to use MaybeOwned, so now callers
have to destroy it more carefully, so CPDF_StreamAcc does not end up
with a dangling pointer.
BUG=chromium:887626
Change-Id: Id5e7af96aad6270c444485c1574182da5dbd9ebf
Reviewed-on: https://pdfium-review.googlesource.com/42893
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdf_flatten.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_flatten.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index cca28bc300..01f3cd7e1e 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -200,11 +200,13 @@ void SetPageContents(const ByteString& key, pPage->ConvertToIndirectObjectFor(pdfium::page_object::kContents, pDocument); if (!pContentsArray) { pContentsArray = pDocument->NewIndirect<CPDF_Array>(); - auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pContentsStream); - pAcc->LoadAllDataFiltered(); ByteString sStream = "q\n"; - ByteString sBody = ByteString(pAcc->GetData(), pAcc->GetSize()); - sStream = sStream + sBody + "\nQ"; + { + auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pContentsStream); + pAcc->LoadAllDataFiltered(); + sStream += ByteString(pAcc->GetData(), pAcc->GetSize()); + sStream += "\nQ"; + } pContentsStream->SetDataAndRemoveFilter(sStream.AsRawSpan()); pContentsArray->Add(pContentsStream->MakeReference(pDocument)); pPage->SetFor(pdfium::page_object::kContents, |