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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:57:24 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit aa808893c1376ea94a68439af667dcd8c6e22853
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 6 01:25:19 2002 +0000

    	- fixed 3084704 -- crash in HTMLTokenizer on page with JavaScript
    	HTMLDocument::Close inside a <script>
    
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _detachFromParent]):
    	We need to stop loading here. Otherwise we might do loading after closeURL,
    	which could lead to a problem like the one above.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 75965f8..25a8163 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-11-05  Darin Adler  <darin at apple.com>
 
+	- fixed 3084704 -- crash in HTMLTokenizer on page with JavaScript
+	HTMLDocument::Close inside a <script>
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _detachFromParent]):
+	We need to stop loading here. Otherwise we might do loading after closeURL,
+	which could lead to a problem like the one above.
+
+2002-11-05  Darin Adler  <darin at apple.com>
+
 	- changed our MacBinary decoding to not pay any attention to the comment
 
 	Before we would "fail to decode" if the comment was truncated, now we just
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 75965f8..25a8163 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-11-05  Darin Adler  <darin at apple.com>
 
+	- fixed 3084704 -- crash in HTMLTokenizer on page with JavaScript
+	HTMLDocument::Close inside a <script>
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _detachFromParent]):
+	We need to stop loading here. Otherwise we might do loading after closeURL,
+	which could lead to a problem like the one above.
+
+2002-11-05  Darin Adler  <darin at apple.com>
+
 	- changed our MacBinary decoding to not pay any attention to the comment
 
 	Before we would "fail to decode" if the comment was truncated, now we just
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index b795a45..8dc713c 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -152,6 +152,7 @@ static const char * const stateNames[] = {
     WebBridge *bridge = _private->bridge;
     _private->bridge = nil;
     
+    [self stopLoading];
     [bridge closeURL];
 
     [[self children] makeObjectsPerformSelector:@selector(_detachFromParent)];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list