commit 6bc9ee546b9c25e3c3b6fd55ba85f604cfb62038
author Tom Sepez <tsepez@chromium.org> Thu Aug 11 18:13:09 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 11 18:13:09 2022 +0000
tree 448229a1b48c719cb3ee7b5d543289a57230ed7a
parent dd844b8101039672374c8bd8e7a6d1d196e0540c

Introduce CPDF_Image::CreateNewDIB() helper method

Consolidate some code inside CPDF_Image class.

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

fpdfsdk/fpdf_editimg.cpp

diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index 0ead01d..5a40c7b 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -375,8 +375,11 @@
   if (!pPage || !pPage->GetDocument() || !pImg->GetStream())
     return true;
 
-  auto pSource =
-      pdfium::MakeRetain<CPDF_DIB>(pPage->GetDocument(), pImg->GetStream());
+  // A cross-document image may have come from the embedder.
+  if (pPage->GetDocument() != pImg->GetDocument())
+    return false;
+
+  RetainPtr<CPDF_DIB> pSource = pImg->CreateNewDIB();
   CPDF_DIB::LoadState ret = pSource->StartLoadDIBBase(
       false, nullptr, pPage->GetPageResources(), false,
       CPDF_ColorSpace::Family::kUnknown, false);