PasswordAutofillAgent: do not provisionally save forms in NULL frames

components/autofill/content/renderer/password_autofill_agent.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 515 matching lines @@
   // TODO(vabr): Get a mutable argument instead. http://crbug.com/397083
   blink::WebInputElement mutable_element = element;  // We need a non-const.
 
   if (element.isPasswordField()) {
     // Some login forms have event handlers that put a hash of the password into
     // a hidden field and then clear the password (http://crbug.com/28910,
     // http://crbug.com/391693). This method gets called before any of those
     // handlers run, so save away a copy of the password in case it gets lost.
     // To honor the user having explicitly cleared the password, even an empty
     // password will be saved here.
-    ProvisionallySavePassword(
-        element.document().frame(), element.form(), RESTRICTION_NONE);
+    blink::WebLocalFrame* element_frame = element.document().frame();
+    if (element_frame) {

[Mike West, 2014/10/13 13:13:00]

You can put the whole assignment into the 'if'.

[vabr (Chromium), 2014/10/13 13:53:17]

Done.

+      ProvisionallySavePassword(
+          element_frame, element.form(), RESTRICTION_NONE);
+    }
 
     PasswordToLoginMap::iterator iter = password_to_username_.find(element);

[Mike West, 2014/10/13 13:13:00]

Do we need to do the rest of this if we're not in a Frame?

[vabr (Chromium), 2014/10/13 13:53:17]

The second part is there for cases, where the user edits a password, and Chrome
remembers that in order not to overwrite it by autofilling. That is independent
of the attempt to save the typed password for later. Therefore I'm keeping the
code to execute here.

     if (iter != password_to_username_.end()) {
       login_to_password_info_[iter->second].password_was_edited_last = true;
       // Note that the suggested value of |mutable_element| was reset when its
       // value changed.
       mutable_element.setAutofilled(false);
     }
     return false;
   }
 
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(element);
@@ skipping 669 matching lines @@
   scoped_ptr<PasswordForm> password_form(CreatePasswordForm(form));
   if (!password_form || (restriction == RESTRICTION_NON_EMPTY_PASSWORD &&
                          password_form->password_value.empty() &&
                          password_form->new_password_value.empty())) {
     return;
   }
   provisionally_saved_forms_[frame].reset(password_form.release());
 }
 
 }  // namespace autofill