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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 57fecd8d2b580275c58e0c58e8d9b4aa5fed46bb
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 11 02:22:47 2003 +0000

            Reviewed by Maciej.
    
    	- fixed 3225042 - MallocDebug shows "access after deallocated" problem in WebFrameView
    
            * WebView.subproj/WebFrameView.m:
            (-[WebFrameView dealloc]): Nil out _private.
            (-[WebFrameView nextKeyView]): Check _private for nil.
            (-[WebFrameView previousKeyView]): Check _private for nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4071 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d6c536d..7cb16fa 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-10  Darin Adler (Maciej committing for Darin)  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3225042 - MallocDebug shows "access after deallocated" problem in WebFrameView
+
+        * WebView.subproj/WebFrameView.m:
+        (-[WebFrameView dealloc]): Nil out _private.
+        (-[WebFrameView nextKeyView]): Check _private for nil.
+        (-[WebFrameView previousKeyView]): Check _private for nil.
+ 
 2003-04-10  Richard Williamson   <rjw at apple.com>
 
         Fix performance regression with iBench (post 71).  The iBench cheat was being defeated.
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 7908e86..a2251c0 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -68,6 +68,7 @@ enum {
     --WebFrameViewCount;
     
     [_private release];
+    _private = nil;
     
     [super dealloc];
 }
@@ -271,7 +272,7 @@ enum {
 
 - (NSView *)nextKeyView
 {
-    if (_private->inNextValidKeyView) {
+    if (_private != nil && _private->inNextValidKeyView) {
         WebFrame *webFrame = [self webFrame];
         WebView *webView = [[self webFrame] webView];
         if (webFrame == [webView mainFrame]) {
@@ -283,7 +284,7 @@ enum {
 
 - (NSView *)previousKeyView
 {
-    if (_private->inNextValidKeyView) {
+    if (_private != nil && _private->inNextValidKeyView) {
         WebFrame *webFrame = [self webFrame];
         WebView *webView = [[self webFrame] webView];
         if (webFrame == [webView mainFrame]) {

-- 
WebKit Debian packaging