Check whether a pdf has XFA fields before loading XFA fields

fpdfsdk/src/fpdfview.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fpdfview.h"
 #include "../include/fsdk_rendercontext.h"
@@ skipping 287 matching lines @@
         if (!pPDFDoc)
                 return NULL;
 
         CPDFXFA_App* pProvider = FPDFXFA_GetApp();
         CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pProvider);
         return pDocument;
 }
 
 DLLEXPORT FX_BOOL STDCALL FPDF_HasXFAField(FPDF_DOCUMENT document, int& docType)
 {
-        if (!document)
+        if (!document || !((CPDFXFA_Document*)document)->GetPDFDoc())

[Tom Sepez, 2015/03/03 00:53:34]

nit: I'd do this as a local variable assignment followed by a separate
if-statemnt just to be consistent with the flow below.  Can we use a C++-style
cast here?

[jun_fang, 2015/03/03 01:02:31]

OK.

                 return FALSE;
 
-        CPDF_Dictionary* pRoot = ((CPDF_Document*)document)->GetRoot();
+        CPDF_Dictionary* pRoot = (((CPDFXFA_Document*)document)->GetPDFDoc())->GetRoot();
         if (!pRoot)
                 return FALSE;
 
         CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
         if (!pAcroForm)
                 return FALSE;
 
         CPDF_Object* pXFA = pAcroForm->GetElement("XFA");
         if (!pXFA)
                 return FALSE;
 
         FX_BOOL bDynamicXFA = pRoot->GetBoolean("NeedsRendering", FALSE);
 
         if (bDynamicXFA)
                 docType = DOCTYPE_DYNIMIC_XFA;
         else
                 docType = DOCTYPE_STATIC_XFA;
 
         return TRUE;
 }
 
 DLLEXPORT  FPDF_BOOL STDCALL FPDF_LoadXFA(FPDF_DOCUMENT document)
 {
-        if (!document) 
-                return FALSE;
-
-        int iDocType = DOCTYPE_PDF;
-        FX_BOOL hasXFAField = FPDF_HasXFAField(document, iDocType);
-        if (!hasXFAField)
-                return FALSE;
-        return ((CPDFXFA_Document*)document)->LoadXFADoc();
+        return (document && ((CPDFXFA_Document*)document)->LoadXFADoc());

[Tom Sepez, 2015/03/03 00:53:34]

nit: outer ( ) not needed.

[jun_fang, 2015/03/03 01:02:30]

OK.

 }
 
 
 extern void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code);
 
 class CMemFile FX_FINAL: public IFX_FileRead, public CFX_Object
 {
 public:
         CMemFile(FX_BYTE* pBuf, FX_FILESIZE size):m_pBuf(pBuf),m_size(size) {}
 
@@ skipping 735 matching lines @@
     if (!buffer) {
         buflen = len;
     } else if (buflen >= len) {
         memcpy(buffer, utf16Name.c_str(), len);
         buflen = len;
     } else {
         buflen = -1;
     }
     return (FPDF_DEST)pDestObj;
 }