commit 1a45ce380ec6776ac100017c68a4b8643983d2db
author Ryan Harrison <rharrison@chromium.org> Thu Oct 05 14:11:31 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Thu Oct 05 18:31:36 2017 +0000
tree 6d20b6b6ce639abaa1842fd4ef5f468e1889e802
parent b5787481f77fc0a002a10c8047aad591a805f723

Add ObservedPtrs to catch issues in SaveData

BUG=chromium:756427

Change-Id: I90c7065ec5a467cb954cdf3e1d6954a0b0655d4e
Reviewed-on: https://pdfium-review.googlesource.com/15630
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>

fpdfsdk/formfiller/cffl_interactiveformfiller.cpp

diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index 70d3990..fb1afe9 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -672,9 +672,10 @@
     return;
 
   CPDFSDK_Widget* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot->Get());
-  ASSERT(pWidget);
-  CPDFSDK_InterForm* pInterForm = pPageView->GetFormFillEnv()->GetInterForm();
-  pInterForm->OnCalculate(pWidget->GetFormField());
+  if (pWidget) {
+    CPDFSDK_InterForm* pInterForm = pPageView->GetFormFillEnv()->GetInterForm();
+    pInterForm->OnCalculate(pWidget->GetFormField());
+  }
   m_bNotifying = false;
 }
 

fpdfsdk/formfiller/cffl_textfield.cpp

diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index 76434a5..4174ae4 100644
--- a/fpdfsdk/formfiller/cffl_textfield.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -139,10 +139,15 @@
   WideString sOldValue = m_pWidget->GetValue();
   WideString sNewValue = pWnd->GetText();
 
+  CPDFSDK_Widget::ObservedPtr observed_widget(m_pWidget.Get());
+  CFFL_TextField::ObservedPtr observed_this(this);
   m_pWidget->SetValue(sNewValue, false);
-  m_pWidget->ResetFieldAppearance(true);
-  m_pWidget->UpdateField();
-  SetChangeMark();
+  if (observed_widget)
+    m_pWidget->ResetFieldAppearance(true);
+  if (observed_widget)
+    m_pWidget->UpdateField();
+  if (observed_this)
+    SetChangeMark();
 }
 
 void CFFL_TextField::GetActionData(CPDFSDK_PageView* pPageView,