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

[darin]

The following commit has been merged in the debian/unstable branch:
commit fe87a7c0f2054ebd2e93b7f864710c9834bea6f2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 01:11:47 2003 +0000

            Reviewed by John.
    
    	- fixed 3158624 -- crash reentering WebBaseNetscapePluginView removeTrackingRect closing window
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView removeTrackingRect]):
    	Set tracking tag to 0 before releasing the window to prevent reentering.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7ac5980..49a9c85 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3158624 -- crash reentering WebBaseNetscapePluginView removeTrackingRect closing window
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView removeTrackingRect]):
+	Set tracking tag to 0 before releasing the window to prevent reentering.
+
 2003-01-29  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 1b77b38..c1535f0 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -614,9 +614,11 @@ typedef struct {
 {
     if (trackingTag) {
         [self removeTrackingRect:trackingTag];
+        trackingTag = 0;
+
         // Must release the window to balance the retain in resetTrackingRect.
+        // But must do it after setting trackingTag to 0 so we don't re-enter.
         [[self window] release];
-        trackingTag = 0;
     }
 }
 

-- 
WebKit Debian packaging