commit 54fb169c5bd069c09d498275efae8e005252e7cd
author Lei Zhang <thestig@chromium.org> Wed Jul 29 17:40:31 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jul 29 17:40:31 2020 +0000
tree 3ff83ed71dfc60c3cc92531088f2900340ea2223
parent bff8e456123bed11635f766e50a4d5b53da0c99d

Remove an unreachable condition in GetXFAEntryFromDocument().

All the callers already validate the input to GetXFAEntryFromDocument().

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

fpdfsdk/fpdf_view.cpp

diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 22ef51a..a090367 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -90,11 +90,7 @@
 
 bool g_bLibraryInitialized = false;
 
-const CPDF_Object* GetXFAEntryFromDocument(FPDF_DOCUMENT document) {
-  const CPDF_Document* doc = CPDFDocumentFromFPDFDocument(document);
-  if (!doc)
-    return nullptr;
-
+const CPDF_Object* GetXFAEntryFromDocument(const CPDF_Document* doc) {
   const CPDF_Dictionary* root = doc->GetRoot();
   if (!root)
     return nullptr;
@@ -1181,11 +1177,12 @@
 }
 
 FPDF_EXPORT int FPDF_CALLCONV FPDF_GetXFAPacketCount(FPDF_DOCUMENT document) {
-  if (!document)
+  CPDF_Document* doc = CPDFDocumentFromFPDFDocument(document);
+  if (!doc)
     return -1;
 
   return pdfium::CollectionSize<int>(
-      GetXFAPackets(GetXFAEntryFromDocument(document)));
+      GetXFAPackets(GetXFAEntryFromDocument(doc)));
 }
 
 FPDF_EXPORT unsigned long FPDF_CALLCONV
@@ -1193,11 +1190,12 @@
                       int index,
                       void* buffer,
                       unsigned long buflen) {
-  if (!document || index < 0)
+  CPDF_Document* doc = CPDFDocumentFromFPDFDocument(document);
+  if (!doc || index < 0)
     return 0;
 
   std::vector<XFAPacket> xfa_packets =
-      GetXFAPackets(GetXFAEntryFromDocument(document));
+      GetXFAPackets(GetXFAEntryFromDocument(doc));
   if (static_cast<size_t>(index) >= xfa_packets.size())
     return 0;
 
@@ -1211,11 +1209,12 @@
                          void* buffer,
                          unsigned long buflen,
                          unsigned long* out_buflen) {
-  if (!document || index < 0 || !out_buflen)
+  CPDF_Document* doc = CPDFDocumentFromFPDFDocument(document);
+  if (!doc || index < 0 || !out_buflen)
     return false;
 
   std::vector<XFAPacket> xfa_packets =
-      GetXFAPackets(GetXFAEntryFromDocument(document));
+      GetXFAPackets(GetXFAEntryFromDocument(doc));
   if (static_cast<size_t>(index) >= xfa_packets.size())
     return false;