Changeset 93692 in webkit

Timestamp:

Aug 23, 2011 9:32:42 PM (13 years ago)

Author:

abarth@webkit.org

Message:

WebSearchableFormData crashes when given a detached HTMLFormElement
​https://bugs.webkit.org/show_bug.cgi?id=66831

Reviewed by Dimitri Glazkov.

We need to null-check the Frame.

• src/WebSearchableFormData.cpp:

(HTMLNames::GetFormEncoding):

• tests/WebFrameTest.cpp:

(WebKit::TEST_F):

• tests/data/form.html: Added.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebSearchableFormData.cpp (modified) (1 diff)
• tests/WebFrameTest.cpp (modified) (3 diffs)
• tests/data/form.html (added)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-23  Adam Barth  <abarth@webkit.org>
+
+        WebSearchableFormData crashes when given a detached HTMLFormElement
+        https://bugs.webkit.org/show_bug.cgi?id=66831
+
+        Reviewed by Dimitri Glazkov.
+
+        We need to null-check the Frame.
+
+        * src/WebSearchableFormData.cpp:
+        (HTMLNames::GetFormEncoding):
+        * tests/WebFrameTest.cpp:
+        (WebKit::TEST_F):
+        * tests/data/form.html: Added.
+
 2011-08-23  Iain Merrick  <husky@google.com>
 

trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp

@@ -65 +65 @@
             return;
     }
+    if (!form->document()->frame())
+         return;
     *encoding = TextEncoding(form->document()->loader()->writer()->encoding());
 }

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -31 +31 @@
 #include "config.h"
 
-#include <googleurl/src/gurl.h>
-#include <gtest/gtest.h>
-#include <webkit/support/webkit_support.h>
+#include "WebDocument.h"
+#include "WebFormElement.h"
 #include "WebFrame.h"
 #include "WebFrameClient.h"
+#include "WebSearchableFormData.h"
 #include "WebSettings.h"
 #include "WebString.h"
@@ -43 +43 @@
 #include "WebView.h"
 #include "v8.h"
+#include <googleurl/src/gurl.h>
+#include <gtest/gtest.h>
+#include <webkit/support/webkit_support.h>
 
 using namespace WebKit;
@@ -146 +149 @@
 }
 
+TEST_F(WebFrameTest, FormWithNullFrame)
+{
+    registerMockedURLLoad("form.html");
+
+    TestWebFrameClient webFrameClient;
+    WebView* webView = WebView::create(0);
+    webView->initializeMainFrame(&webFrameClient);
+
+    loadFrame(webView->mainFrame(), "form.html");
+    serveRequests();
+
+    WebVector<WebFormElement> forms;
+    webView->mainFrame()->document().forms(forms);
+    webView->close();
+
+    EXPECT_EQ(forms.size(), 1U);
+
+    // This test passes if this doesn't crash.
+    WebSearchableFormData searchableDataForm(forms[0]);
 }
+
+}