[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 772f0276b1f9c4844d39642929e4308c7547b208
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 10 00:46:10 2003 +0000

            Reviewed by Maciej.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::saveLocationProperties): Add locking around the call to get the location
            since it can allocate.
            (KWQKHTMLPart::restoreLocationProperties): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b1b42d5..90b8c6c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-12-09  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::saveLocationProperties): Add locking around the call to get the location
+        since it can allocate.
+        (KWQKHTMLPart::restoreLocationProperties): Ditto.
+
 2003-12-09  David Hyatt  <hyatt at apple.com>
 
 	Fix for mojibake bg painting problem on bofa.com.  The bug # is 3487144.  Transparent colors were not
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5ee86c6..49e11ab 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -87,6 +87,8 @@ using khtml::VISIBLE;
 
 using KIO::Job;
 
+using KJS::Interpreter;
+using KJS::Location;
 using KJS::SavedBuiltins;
 using KJS::SavedProperties;
 using KJS::ScheduledAction;
@@ -1141,8 +1143,12 @@ void KWQKHTMLPart::saveWindowProperties(SavedProperties *windowProperties)
 void KWQKHTMLPart::saveLocationProperties(SavedProperties *locationProperties)
 {
     Window *window = Window::retrieveWindow(this);
-    if (window)
-        window->location()->saveProperties(*locationProperties);
+    if (window) {
+        Interpreter::lock();
+        Location *location = window->location();
+        Interpreter::unlock();
+        location->saveProperties(*locationProperties);
+    }
 }
 
 void KWQKHTMLPart::restoreWindowProperties(SavedProperties *windowProperties)
@@ -1155,8 +1161,12 @@ void KWQKHTMLPart::restoreWindowProperties(SavedProperties *windowProperties)
 void KWQKHTMLPart::restoreLocationProperties(SavedProperties *locationProperties)
 {
     Window *window = Window::retrieveWindow(this);
-    if (window)
-        window->location()->restoreProperties(*locationProperties);
+    if (window) {
+        Interpreter::lock();
+        Location *location = window->location();
+        Interpreter::unlock();
+        location->restoreProperties(*locationProperties);
+    }
 }
 
 void KWQKHTMLPart::saveInterpreterBuiltins(SavedBuiltins &interpreterBuiltins)

-- 
WebKit Debian packaging