commit 8128485d0169a8dcbe14289a868ff3c27440bfcf
author Tom Sepez <tsepez@chromium.org> Tue Jun 12 19:26:15 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Jun 12 19:26:15 2018 +0000
tree fd80bed666b8861efe40396bb599c948eb8c3c91
parent a3843c99e7a631b2fbf87bbc12834e61bfb7b6f2

CheckUnSupportError() always called with FPDF_ERR_SUCCESS.

So remove the argument, and the logic dependent upon it being otherwise.
Rename function to more accurately reflect its purpose. Remove needless
null check while we're at it.

Change-Id: I7e119429fd159334eabcc250b5dac215580882ea
Reviewed-on: https://pdfium-review.googlesource.com/34950
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

fpdfsdk/cpdfsdk_helpers.cpp

diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index 391e797..943e3a3 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -199,15 +199,7 @@
   }
 }
 
-void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code) {
-  // Security
-  if (err_code == FPDF_ERR_SECURITY) {
-    RaiseUnSupportError(FPDF_UNSP_DOC_SECURITY);
-    return;
-  }
-  if (!pDoc)
-    return;
-
+void ReportUnsupportedFeatures(CPDF_Document* pDoc) {
   const CPDF_Dictionary* pRootDict = pDoc->GetRoot();
   if (pRootDict) {
     // Portfolios and Packages
@@ -236,6 +228,7 @@
         }
       }
     }
+
     // SharedForm
     const CPDF_Stream* pStream = pRootDict->GetStreamFor("Metadata");
     if (pStream) {

fpdfsdk/cpdfsdk_helpers.h

diff --git a/fpdfsdk/cpdfsdk_helpers.h b/fpdfsdk/cpdfsdk_helpers.h
index 98d7e45..88e0530 100644
--- a/fpdfsdk/cpdfsdk_helpers.h
+++ b/fpdfsdk/cpdfsdk_helpers.h
@@ -246,7 +246,7 @@
                             bool bNeedToRestore,
                             IPDFSDK_PauseAdapter* pause);
 
-void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code);
+void ReportUnsupportedFeatures(CPDF_Document* pDoc);
 void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot);
 
 #ifndef _WIN32

fpdfsdk/fpdf_dataavail.cpp

diff --git a/fpdfsdk/fpdf_dataavail.cpp b/fpdfsdk/fpdf_dataavail.cpp
index d7bcf8f..1b5fbeb 100644
--- a/fpdfsdk/fpdf_dataavail.cpp
+++ b/fpdfsdk/fpdf_dataavail.cpp
@@ -162,7 +162,7 @@
   document->SetExtension(pdfium::MakeUnique<CPDFXFA_Context>(document.get()));
 #endif  // PDF_ENABLE_XFA
 
-  CheckUnSupportError(document.get(), FPDF_ERR_SUCCESS);
+  ReportUnsupportedFeatures(document.get());
   return FPDFDocumentFromCPDFDocument(document.release());
 }
 

fpdfsdk/fpdf_view.cpp

diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 4f10bcb..bfaf537 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -156,7 +156,7 @@
   pDocument->SetExtension(pdfium::MakeUnique<CPDFXFA_Context>(pDocument.get()));
 #endif  // PDF_ENABLE_XFA
 
-  CheckUnSupportError(pDocument.get(), error);
+  ReportUnsupportedFeatures(pDocument.get());
   return FPDFDocumentFromCPDFDocument(pDocument.release());
 }