From 1df1efa3921841fb5fc7fc15e8112eed4375de9f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 7 Sep 2016 09:55:37 -0700 Subject: Fixup CPDFSDK_PageView and CPDF_Page interactions. There are several issues when CPDFSDK_PageView and CPDF_Page interact, especially around deletion. This Cl fixes up several places where things go wrong working with these objects. BUG=chromium:632709 Review-Url: https://codereview.chromium.org/2319663002 --- fpdfsdk/javascript/Field.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/javascript/Field.cpp') diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index 3f5e5e1b0f..64c7735dcf 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -260,11 +260,12 @@ void Field::UpdateFormField(CPDFSDK_Document* pDocument, FX_BOOL bChangeMark, FX_BOOL bResetAP, FX_BOOL bRefresh) { - std::vector widgets; CPDFSDK_InterForm* pInterForm = pDocument->GetInterForm(); - pInterForm->GetWidgets(pFormField, &widgets); if (bResetAP) { + std::vector widgets; + pInterForm->GetWidgets(pFormField, &widgets); + int nFieldType = pFormField->GetFieldType(); if (nFieldType == FIELDTYPE_COMBOBOX || nFieldType == FIELDTYPE_TEXTFIELD) { for (CPDFSDK_Annot* pAnnot : widgets) { @@ -285,6 +286,12 @@ void Field::UpdateFormField(CPDFSDK_Document* pDocument, } if (bRefresh) { + // Refresh the widget list. The calls in |bResetAP| may have caused widgets + // to be removed from the list. We need to call |GetWidgets| again to be + // sure none of the widgets have been deleted. + std::vector widgets; + pInterForm->GetWidgets(pFormField, &widgets); + for (CPDFSDK_Widget* pWidget : widgets) { CPDFSDK_Document* pDoc = pWidget->GetInterForm()->GetDocument(); pDoc->UpdateAllViews(nullptr, pWidget); -- cgit v1.2.3