[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 a7881fc966a2790df0b7c40de00acbd61a51ad30
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 15 23:33:31 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3143418 - controller assert in WebStandardPanels _didStartLoadingURL
    	- fixed 3141212 - crash in kjs garbage collection (contextimp mark)
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge startLoadingResource:withURL:]): If the data source
    	doesn't have a controller, then block the load.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cfcd978..f71193f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-15  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3143418 - controller assert in WebStandardPanels _didStartLoadingURL
+	- fixed 3141212 - crash in kjs garbage collection (contextimp mark)
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge startLoadingResource:withURL:]): If the data source
+	doesn't have a controller, then block the load.
+
 2003-01-15  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 355188a..2bbb9a5 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -204,6 +204,12 @@
 
 - (id <WebCoreResourceHandle>)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader withURL:(NSString *)URL
 {
+    // If we are no longer attached to a controller, this must be an attempted load from an
+    // onUnload handler, so let's just block it.
+    if ([[self dataSource] controller] == nil) {
+	return nil;
+    }
+
     return [WebSubresourceClient startLoadingResource:resourceLoader
                                               withURL:[NSURL _web_URLWithString:URL]
                                              referrer:[self referrer]

-- 
WebKit Debian packaging