Merge r175158 - WebContent crash at WebCore::RenderTextControl::textF…

…ormControlElement const. https://bugs.webkit.org/show_bug.cgi?id=138035 Reviewed by Antti Koivisto. NULL-check element().renderer() before using it. * html/SearchInputType.cpp: (WebCore::SearchInputType::didSetValueByUserEdit):
WebKit · Apr 7, 2015 · aec3832 · aec3832
1 parent a4a9a95
commit aec3832
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-10-23  Zalan Bujtas  <zalan@apple.com>
+
+        WebContent crash at WebCore::RenderTextControl::textFormControlElement const.
+        https://bugs.webkit.org/show_bug.cgi?id=138035
+
+        Reviewed by Antti Koivisto.
+
+        NULL-check element().renderer() before using it.
+
+        * html/SearchInputType.cpp:
+        (WebCore::SearchInputType::didSetValueByUserEdit):
+
 2015-04-07  Tomas Popela  <tpopela@redhat.com>
 
         REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled

diff --git a/Source/WebCore/html/SearchInputType.cpp b/Source/WebCore/html/SearchInputType.cpp
@@ -178,7 +178,7 @@ bool SearchInputType::searchEventsShouldBeDispatched() const
 
 void SearchInputType::didSetValueByUserEdit(ValueChangeState state)
 {
-    if (m_cancelButton)
+    if (m_cancelButton && element().renderer())
         toRenderSearchField(element().renderer())->updateCancelButtonVisibility();
 
     // If the incremental attribute is set, then dispatch the search event