commit bc0d5454cea346a9f174962a2b4aa42cab84afdc
author Lei Zhang <thestig@chromium.org> Mon Aug 09 23:06:27 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 09 23:06:27 2021 +0000
tree fb10fe7bb8261ced1eab1c92ad6bc2688a587144
parent 762b88f556e60832c9886bea2c6d2abf0ee871f7

Use CPDF_Dictionary::IsValidKey() in CPDFSDK_AppStream::AddImage().

Use the IsValidKey() check to avoid passing invalid keys into
CPDF_Dictionary.

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

fpdfsdk/cpdfsdk_appstream.cpp

diff --git a/fpdfsdk/cpdfsdk_appstream.cpp b/fpdfsdk/cpdfsdk_appstream.cpp
index cc7d866..b1edb0e 100644
--- a/fpdfsdk/cpdfsdk_appstream.cpp
+++ b/fpdfsdk/cpdfsdk_appstream.cpp
@@ -1835,10 +1835,11 @@
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
   ByteString sImageAlias = "IMG";
 
-  if (CPDF_Dictionary* pImageDict = pImage->GetDict()) {
-    sImageAlias = pImageDict->GetStringFor("Name");
-    if (sImageAlias.IsEmpty())
-      sImageAlias = "IMG";
+  CPDF_Dictionary* pImageDict = pImage->GetDict();
+  if (pImageDict) {
+    ByteString image_name = pImageDict->GetStringFor("Name");
+    if (CPDF_Dictionary::IsValidKey(image_name))
+      sImageAlias = std::move(image_name);
   }
 
   CPDF_Dictionary* pStreamResList = pStreamDict->GetDictFor("Resources");