[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

sullivan at apple.com sullivan at apple.com
Wed Dec 22 13:22:49 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4053217e53a1cde6aee1f7411a389e56cf962631
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 16:32:21 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=45677
    [WebView canMarkAllTextMatches] can crash if called after [WebView close]
    
    Reviewed by Adam Roben.
    
    <rdar://problem/8404890>
    
    * WebView/WebView.mm:
    (-[WebView canMarkAllTextMatches]):
    Return NO immediately if the webview has already been closed. This was an overlooked
    case from the fix for 45175.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67393 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 177b1c6..d303fcc 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-13  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45677
+        [WebView canMarkAllTextMatches] can crash if called after [WebView close]
+        
+        <rdar://problem/8404890>
+
+        * WebView/WebView.mm:
+        (-[WebView canMarkAllTextMatches]):
+        Return NO immediately if the webview has already been closed. This was an overlooked
+        case from the fix for 45175.
+
 2010-09-10  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Tony Chang.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 0182fa5..1c5f9f6 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -4399,6 +4399,9 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 
 - (BOOL)canMarkAllTextMatches
 {
+    if (_private->closed)
+        return NO;
+
     WebFrame *frame = [self mainFrame];
     do {
         id <WebDocumentView> view = [[frame frameView] documentView];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list