Title: [132951] trunk/Source/WebKit2
Revision
132951
Author
[email protected]
Date
2012-10-30 15:52:54 -0700 (Tue, 30 Oct 2012)

Log Message

Regression(r132887): Caused segfault in a EWK2UnitTestBase.ewk_view_text_find
https://bugs.webkit.org/show_bug.cgi?id=100781

Patch by Christophe Dumez <[email protected]> on 2012-10-30
Reviewed by Kenneth Rohde Christiansen.

Make sure we pass a pointer to zero instead of a NULL pointer
as parameter to the "text,found" in case the text could not
be found. This prevents crashing in
EWK2UnitTestBase.ewk_view_text_find when trying to dereference
the parameter pointer.

* UIProcess/efl/FindClientEfl.cpp:
(WebKit::FindClientEfl::didFailToFindString):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (132950 => 132951)


--- trunk/Source/WebKit2/ChangeLog	2012-10-30 22:44:43 UTC (rev 132950)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-30 22:52:54 UTC (rev 132951)
@@ -1,3 +1,19 @@
+2012-10-30  Christophe Dumez  <[email protected]>
+
+        Regression(r132887): Caused segfault in a EWK2UnitTestBase.ewk_view_text_find
+        https://bugs.webkit.org/show_bug.cgi?id=100781
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Make sure we pass a pointer to zero instead of a NULL pointer
+        as parameter to the "text,found" in case the text could not
+        be found. This prevents crashing in
+        EWK2UnitTestBase.ewk_view_text_find when trying to dereference
+        the parameter pointer.
+
+        * UIProcess/efl/FindClientEfl.cpp:
+        (WebKit::FindClientEfl::didFailToFindString):
+
 2012-10-30  Brady Eidson  <[email protected]>
 
         Crash in WebProcess at com.apple.WebCore: WebCore::ResourceLoader::start

Modified: trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp (132950 => 132951)


--- trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp	2012-10-30 22:44:43 UTC (rev 132950)
+++ trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp	2012-10-30 22:52:54 UTC (rev 132951)
@@ -48,7 +48,8 @@
 void FindClientEfl::didFailToFindString(WKPageRef, WKStringRef, const void* clientInfo)
 {
     FindClientEfl* findClient = toFindClientEfl(clientInfo);
-    findClient->m_viewImpl->smartCallback<TextFound>().call();
+    unsigned matchCount = 0;
+    findClient->m_viewImpl->smartCallback<TextFound>().call(&matchCount);
 }
 
 FindClientEfl::FindClientEfl(EwkViewImpl* viewImpl)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to