commit e6104dc97490c32325709da8ea103466bd1fcd04
author Hajime Hoshi <hajimehoshi@chromium.org> Tue Mar 20 05:58:02 2018
committer Commit Bot <commit-bot@chromium.org> Tue Mar 20 05:58:02 2018
tree 179ceabcfe4aa4eba1559d98c9357ac22a3392da
parent dcac90e5257d772e0e27e9cc9e197a8108bae46b

autofill: Early return when |element_| is null

This CL adds early-returns to mojom::AutofillAgent override functions
when |element_| is null. Now |element_| can be null anytime after
DidCommitProvisionalLoad is called (https://chromium-review.googlesource.com/c/chromium/src/+/939224),
checking whether |element_| is null is reuiqred.

Bug: 822649
Change-Id: Id49cc32edf4bb5edbd93da2af9fe5a3fb7205b90
Reviewed-on: https://chromium-review.googlesource.com/968045
Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544294}

components/autofill/content/renderer/autofill_agent.cc

diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 0f10d069..ad18985 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -387,6 +387,9 @@
 
 void AutofillAgent::DoAcceptDataListSuggestion(
     const base::string16& suggested_value) {
+  if (element_.IsNull())
+    return;
+
   WebInputElement* input_element = ToWebInputElement(&element_);
   DCHECK(input_element);
   base::string16 new_value = suggested_value;
@@ -418,6 +421,9 @@
 
 // mojom::AutofillAgent:
 void AutofillAgent::FillForm(int32_t id, const FormData& form) {
+  if (element_.IsNull())
+    return;
+
   if (id != autofill_query_id_ && id != kNoQueryId)
     return;
 
@@ -430,6 +436,9 @@
 }
 
 void AutofillAgent::PreviewForm(int32_t id, const FormData& form) {
+  if (element_.IsNull())
+    return;
+
   if (id != autofill_query_id_)
     return;
 
@@ -441,6 +450,9 @@
 
 void AutofillAgent::FieldTypePredictionsAvailable(
     const std::vector<FormDataPredictions>& forms) {
+  if (element_.IsNull())
+    return;
+
   bool attach_predictions_to_dom =
       base::FeatureList::IsEnabled(features::kAutofillShowTypePredictions);
   for (const auto& form : forms) {
@@ -449,6 +461,9 @@
 }
 
 void AutofillAgent::ClearForm() {
+  if (element_.IsNull())
+    return;
+
   form_cache_.ClearFormWithElement(element_);
 }
 
@@ -467,6 +482,9 @@
 }
 
 void AutofillAgent::FillFieldWithValue(const base::string16& value) {
+  if (element_.IsNull())
+    return;
+
   WebInputElement* input_element = ToWebInputElement(&element_);
   if (input_element) {
     DoFillFieldWithValue(value, input_element);
@@ -475,6 +493,9 @@
 }
 
 void AutofillAgent::PreviewFieldWithValue(const base::string16& value) {
+  if (element_.IsNull())
+    return;
+
   WebInputElement* input_element = ToWebInputElement(&element_);
   if (input_element)
     DoPreviewFieldWithValue(value, input_element);
@@ -486,6 +507,9 @@
 
 void AutofillAgent::FillPasswordSuggestion(const base::string16& username,
                                            const base::string16& password) {
+  if (element_.IsNull())
+    return;
+
   bool handled =
       password_autofill_agent_->FillSuggestion(element_, username, password);
   DCHECK(handled);
@@ -493,6 +517,9 @@
 
 void AutofillAgent::PreviewPasswordSuggestion(const base::string16& username,
                                               const base::string16& password) {
+  if (element_.IsNull())
+    return;
+
   bool handled = password_autofill_agent_->PreviewSuggestion(
       element_, blink::WebString::FromUTF16(username),
       blink::WebString::FromUTF16(password));