Skip to content
Permalink
Browse files
2011-04-11 Anders Carlsson <andersca@apple.com>
        Reviewed by Sam Weinig.

        Crash in WebPageProxy::countStringMatches
        https://bugs.webkit.org/show_bug.cgi?id=58255
        <rdar://problem/9243837>

        * UIProcess/WebPageProxy.cpp:
        (WebKit::WebPageProxy::countStringMatches):
        Return early if the page is not valid.


Canonical link: https://commits.webkit.org/73242@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83474 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Anders Carlsson committed Apr 11, 2011
1 parent 50ebf76 commit 1d005eb30edce072a2d5d0da20a825479064abf8
Showing 2 changed files with 20 additions and 3 deletions.
@@ -1,3 +1,15 @@
2011-04-11 Anders Carlsson <andersca@apple.com>

Reviewed by Sam Weinig.

Crash in WebPageProxy::countStringMatches
https://bugs.webkit.org/show_bug.cgi?id=58255
<rdar://problem/9243837>

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::countStringMatches):
Return early if the page is not valid.

2011-04-11 Sam Weinig <sam@webkit.org>

Reviewed by Anders Carlsson.
@@ -1150,10 +1150,15 @@ void WebPageProxy::hideFindUI()

void WebPageProxy::countStringMatches(const String& string, FindOptions options, unsigned maxMatchCount)
{
if (m_mainFrameHasCustomRepresentation)
if (m_mainFrameHasCustomRepresentation) {
m_pageClient->countStringMatchesInCustomRepresentation(string, options, maxMatchCount);
else
process()->send(Messages::WebPage::CountStringMatches(string, options, maxMatchCount), m_pageID);
return;
}

if (!isValid())
return;

process()->send(Messages::WebPage::CountStringMatches(string, options, maxMatchCount), m_pageID);
}

void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<ScriptValueCallback> prpCallback)

0 comments on commit 1d005eb

Please sign in to comment.