XFA: Restore early return if no FPDF_Page in FORM_DoPageAAction()

fpdfsdk/src/fpdfformfill.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 "../../public/fpdf_formfill.h"
 #include "../../public/fpdfview.h"
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
@@ skipping 637 matching lines @@
                                       pSDKDoc);
   }
 }
 
 DLLEXPORT void STDCALL FORM_DoPageAAction(FPDF_PAGE page,
                                           FPDF_FORMHANDLE hHandle,
                                           int aaType) {
   if (!hHandle || !page)
     return;
   CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
   CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;

[Lei Zhang, 2015/10/30 18:50:08]

Just do the pPage->GetPDFPage() check here?

[Tom Sepez, 2015/10/30 18:58:27]

Done.

   CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
   if (pPageView) {
     CPDFDoc_Environment* pEnv = pSDKDoc->GetEnv();
     CPDFSDK_ActionHandler* pActionHandler = pEnv->GetActionHander();
-    CPDF_Dictionary* pPageDict = pPage->GetPDFPage()->m_pFormDict;
+    CPDF_Page* pPDFPage = pPage->GetPDFPage();
+    if (!pPDFPage)
+      return;
+    CPDF_Dictionary* pPageDict = pPDFPage->m_pFormDict;
     CPDF_AAction aa = pPageDict->GetDict(FX_BSTRC("AA"));
-
-    FX_BOOL bExistOAAction = FALSE;

[Lei Zhang, 2015/10/30 18:50:08]

Remember to merge this to master.

[Tom Sepez, 2015/10/30 18:58:42]

Acknowledged.

-    FX_BOOL bExistCAAction = FALSE;
     if (FPDFPAGE_AACTION_OPEN == aaType) {
-      bExistOAAction = aa.ActionExist(CPDF_AAction::OpenPage);
-      if (bExistOAAction) {
+      if (aa.ActionExist(CPDF_AAction::OpenPage)) {
         CPDF_Action action = aa.GetAction(CPDF_AAction::OpenPage);
         pActionHandler->DoAction_Page(action, CPDF_AAction::OpenPage, pSDKDoc);
       }
     } else {
-      bExistCAAction = aa.ActionExist(CPDF_AAction::ClosePage);
-      if (bExistCAAction) {
+      if (aa.ActionExist(CPDF_AAction::ClosePage)) {
         CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
         pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
       }
     }
   }
 }