From ac67d4765a8ac36cd00c9fc8b6f2b80a3e1cff72 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 2 Oct 2015 14:01:37 -0700 Subject: Do not call into formfiller code with a NULL PageView. BUG=537173 R=jun_fang@foxitsoftware.com, tsepez@chromium.org Review URL: https://codereview.chromium.org/1376093002 . --- fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/src/formfiller/FFL_IFormFiller.cpp') diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index f8f8c6a943..69ff93280e 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -459,7 +459,7 @@ FX_BOOL CFFL_IFormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { } if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, TRUE)) - return pFormFiller->SetFocusForAnnot(pAnnot, nFlag); + pFormFiller->SetFocusForAnnot(pAnnot, nFlag); return TRUE; } @@ -470,8 +470,7 @@ FX_BOOL CFFL_IFormFiller::OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { - if (!pFormFiller->KillFocusForAnnot(pAnnot, nFlag)) - return FALSE; + pFormFiller->KillFocusForAnnot(pAnnot, nFlag); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; -- cgit v1.2.3