[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

sullivan sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:06:53 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1e2d7195786586e1aa68f9a181f0d1fafc059451
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 29 00:39:40 2003 +0000

            - fixed <rdar://problem/3466082>: 7B85/111: Crash viewing web page ([WebView setNextKeyView:])
    
            Reviewed by Chris.
    
            * WebView.subproj/WebView.m:
            (-[WebView dealloc]):
            set _private to nil after releasing, because [super dealloc] can dispatch to it
            (-[WebView mainFrame]):
            fixed spelling error in comment
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5294 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 269e972..dee852a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-28  John Sullivan  <sullivan at apple.com>
+
+        - fixed <rdar://problem/3466082>: 7B85/111: Crash viewing web page ([WebView setNextKeyView:])
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView dealloc]):
+        set _private to nil after releasing, because [super dealloc] can dispatch to it
+        (-[WebView mainFrame]):
+        fixed spelling error in comment
+
 2003-10-28  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3465383>: REGRESSION: Text field progress bar goes to 100% after error or stop
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 106c063..b947268 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -1227,6 +1227,9 @@ NS_ENDHANDLER
     [WebPreferences _removeReferenceForIdentifier: [self preferencesIdentifier]];
     
     [_private release];
+    // [super dealloc] can end up dispatching against _private (3466082)
+    _private = nil;
+
     [super dealloc];
 }
 
@@ -1324,7 +1327,7 @@ NS_ENDHANDLER
 
 - (WebFrame *)mainFrame
 {
-    // This can be called in intialization, before _private has been set up (3465613)
+    // This can be called in initialization, before _private has been set up (3465613)
     if (_private != nil) {
         return _private->mainFrame;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list