Changeset 93692 in webkit
- Timestamp:
- Aug 23, 2011 9:32:42 PM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r93689 r93692 1 2011-08-23 Adam Barth <abarth@webkit.org> 2 3 WebSearchableFormData crashes when given a detached HTMLFormElement 4 https://bugs.webkit.org/show_bug.cgi?id=66831 5 6 Reviewed by Dimitri Glazkov. 7 8 We need to null-check the Frame. 9 10 * src/WebSearchableFormData.cpp: 11 (HTMLNames::GetFormEncoding): 12 * tests/WebFrameTest.cpp: 13 (WebKit::TEST_F): 14 * tests/data/form.html: Added. 15 1 16 2011-08-23 Iain Merrick <husky@google.com> 2 17 -
trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp
r91404 r93692 65 65 return; 66 66 } 67 if (!form->document()->frame()) 68 return; 67 69 *encoding = TextEncoding(form->document()->loader()->writer()->encoding()); 68 70 } -
trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp
r83366 r93692 31 31 #include "config.h" 32 32 33 #include <googleurl/src/gurl.h> 34 #include <gtest/gtest.h> 35 #include <webkit/support/webkit_support.h> 33 #include "WebDocument.h" 34 #include "WebFormElement.h" 36 35 #include "WebFrame.h" 37 36 #include "WebFrameClient.h" 37 #include "WebSearchableFormData.h" 38 38 #include "WebSettings.h" 39 39 #include "WebString.h" … … 43 43 #include "WebView.h" 44 44 #include "v8.h" 45 #include <googleurl/src/gurl.h> 46 #include <gtest/gtest.h> 47 #include <webkit/support/webkit_support.h> 45 48 46 49 using namespace WebKit; … … 146 149 } 147 150 151 TEST_F(WebFrameTest, FormWithNullFrame) 152 { 153 registerMockedURLLoad("form.html"); 154 155 TestWebFrameClient webFrameClient; 156 WebView* webView = WebView::create(0); 157 webView->initializeMainFrame(&webFrameClient); 158 159 loadFrame(webView->mainFrame(), "form.html"); 160 serveRequests(); 161 162 WebVector<WebFormElement> forms; 163 webView->mainFrame()->document().forms(forms); 164 webView->close(); 165 166 EXPECT_EQ(forms.size(), 1U); 167 168 // This test passes if this doesn't crash. 169 WebSearchableFormData searchableDataForm(forms[0]); 148 170 } 171 172 }
Note: See TracChangeset
for help on using the changeset viewer.