commit 215adebfd4d0bfc67e018eebcaffd6cf581657e7
author Lei Zhang <thestig@chromium.org> Wed Jun 19 22:03:09 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jun 19 22:03:09 2019 +0000
tree e06fefbc5462a13b45ecaed9ae9bf85034748062
parent aad535f20600828578a5732de4a4475d75131aa7

Avoid passing nullptr to CFWL_WidgetMgr::NextTab().

NextTab() expects its parent parameter to be non-null.

BUG=chromium:976429

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

xfa/fwl/cfwl_notedriver.cpp

diff --git a/xfa/fwl/cfwl_notedriver.cpp b/xfa/fwl/cfwl_notedriver.cpp
index 3114733..614b71e 100644
--- a/xfa/fwl/cfwl_notedriver.cpp
+++ b/xfa/fwl/cfwl_notedriver.cpp
@@ -174,9 +174,12 @@
     if (m_pFocus && pWidgetMgr->GetSystemFormWidget(m_pFocus.Get()) != pForm)
       pFocus = nullptr;
 
-    CFWL_Widget* pNextTabStop = CFWL_WidgetMgr::NextTab(pForm, pFocus);
-    if (!pNextTabStop)
-      pNextTabStop = CFWL_WidgetMgr::NextTab(pForm, nullptr);
+    CFWL_Widget* pNextTabStop = nullptr;
+    if (pForm) {
+      pNextTabStop = CFWL_WidgetMgr::NextTab(pForm, pFocus);
+      if (!pNextTabStop)
+        pNextTabStop = CFWL_WidgetMgr::NextTab(pForm, nullptr);
+    }
     if (pNextTabStop == pFocus)
       return true;
     if (pNextTabStop)