Changeset 245920 in webkit

Timestamp:

May 30, 2019, 5:29:58 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r245284. rdar://problem/51264857

Protect current WebFrame during form submission
​https://bugs.webkit.org/show_bug.cgi?id=197459
<rdar://problem/50368618>

Reviewed by Alex Christensen.

The 'continueWillSubmitForm' method calls a completion handler that
might affect the state of the current frame. Ensure the frame is valid
for the scope of the function.

• WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::continueWillSubmitForm):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@245284 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebFrame.cpp (modified) (2 diffs)

branches/safari-607-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245284. rdar://problem/51264857
+
+    Protect current WebFrame during form submission
+    https://bugs.webkit.org/show_bug.cgi?id=197459
+    <rdar://problem/50368618>
+    
+    Reviewed by Alex Christensen.
+    
+    The 'continueWillSubmitForm' method calls a completion handler that
+    might affect the state of the current frame. Ensure the frame is valid
+    for the scope of the function.
+    
+    * WebProcess/WebPage/WebFrame.cpp:
+    (WebKit::WebFrame::continueWillSubmitForm):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245284 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-14  Brent Fulgham  <bfulgham@apple.com>
+
+            Protect current WebFrame during form submission
+            https://bugs.webkit.org/show_bug.cgi?id=197459
+            <rdar://problem/50368618>
+
+            Reviewed by Alex Christensen.
+
+            The 'continueWillSubmitForm' method calls a completion handler that
+            might affect the state of the current frame. Ensure the frame is valid
+            for the scope of the function.
+
+            * WebProcess/WebPage/WebFrame.cpp:
+            (WebKit::WebFrame::continueWillSubmitForm):
+
 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234 +234 @@
 void WebFrame::continueWillSubmitForm(uint64_t listenerID)
 {
+    Ref<WebFrame> protectedThis(*this);
     if (auto completionHandler = m_willSubmitFormCompletionHandlers.take(listenerID))
         completionHandler();