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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 653ea5bd43f5ea168f7d2894eb3c61462f31eeef
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 17 01:32:01 2002 +0000

            Fixed 3128477.  Check KJS::Window before saving js objects.
    
            Reviewed by darin.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::saveWindowProperties):
            (KWQKHTMLPart::saveLocationProperties):
            (KWQKHTMLPart::restoreWindowProperties):
            (KWQKHTMLPart::restoreLocationProperties):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b7cbd60..827a643 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-16  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3128477.  Check KJS::Window before saving js objects.
+
+        Reviewed by darin.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::saveWindowProperties):
+        (KWQKHTMLPart::saveLocationProperties):
+        (KWQKHTMLPart::restoreWindowProperties):
+        (KWQKHTMLPart::restoreLocationProperties):
+
 === Alexander-37 ===
 
 2002-12-16  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b7cbd60..827a643 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-16  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3128477.  Check KJS::Window before saving js objects.
+
+        Reviewed by darin.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::saveWindowProperties):
+        (KWQKHTMLPart::saveLocationProperties):
+        (KWQKHTMLPart::restoreWindowProperties):
+        (KWQKHTMLPart::restoreLocationProperties):
+
 === Alexander-37 ===
 
 2002-12-16  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 09d9959..3354d2f 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -441,22 +441,34 @@ bool KWQKHTMLPart::canCachePage()
 
 void KWQKHTMLPart::saveWindowProperties(SavedProperties *windowProperties)
 {
-    Window::retrieveWindow(this)->saveProperties(*windowProperties);
+    KJS::Window *window;
+    window = Window::retrieveWindow(this);
+    if (window)
+        window->saveProperties(*windowProperties);
 }
 
 void KWQKHTMLPart::saveLocationProperties(SavedProperties *locationProperties)
 {
-    Window::retrieveWindow(this)->location()->saveProperties(*locationProperties);
+    KJS::Window *window;
+    window = Window::retrieveWindow(this);
+    if (window)
+        window->saveProperties(*locationProperties);
 }
 
 void KWQKHTMLPart::restoreWindowProperties(SavedProperties *windowProperties)
 {
-    Window::retrieveWindow(this)->restoreProperties(*windowProperties);
+    KJS::Window *window;
+    window = Window::retrieveWindow(this);
+    if (window)
+        window->restoreProperties(*windowProperties);
 }
 
 void KWQKHTMLPart::restoreLocationProperties(SavedProperties *locationProperties)
 {
-    Window::retrieveWindow(this)->location()->restoreProperties(*locationProperties);
+    KJS::Window *window;
+    window = Window::retrieveWindow(this);
+    if (window)
+        window->location()->restoreProperties(*locationProperties);
 }
 
 void KWQKHTMLPart::openURLFromPageCache(DocumentImpl *doc, RenderObject *renderer, KURL *url, SavedProperties *windowProperties, SavedProperties *locationProperties)

-- 
WebKit Debian packaging