[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 acf9716b964c0c2b1c010d4ab86cfbe2e7971512
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 28 21:58:28 2003 +0000

            Reviewed by Richard.
    
    	- fixed 3343050 - nil-deref in saveInterpreterBuiltins running Sherlock via MallocDebug in Panther7B20
    	- fixed 3343942 - Safari crashes when clicking on link w/ JavaScript turned off
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::saveInterpreterBuiltins): Don't attempt to save
    	when JavaScript is off.
            (KWQKHTMLPart::restoreInterpreterBuiltins): Don't attempt to restore
    	when JavaScript is off.
            (KWQKHTMLPart::saveWindowProperties): Remove ERROR, since that
    	case is normal when JS is off.
            (KWQKHTMLPart::saveLocationProperties): Remove ERROR, since that
    	case is normal when JS is off.
            (KWQKHTMLPart::restoreWindowProperties): Remove ERROR, since that
    	case is normal when JS is off.
            (KWQKHTMLPart::restoreLocationProperties): Remove ERROR, since that
    	case is normal when JS is off.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4723 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index eb3169d..c4734a1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,24 @@
+2003-07-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3343050 - nil-deref in saveInterpreterBuiltins running Sherlock via MallocDebug in Panther7B20
+	- fixed 3343942 - Safari crashes when clicking on link w/ JavaScript turned off
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::saveInterpreterBuiltins): Don't attempt to save
+	when JavaScript is off.
+        (KWQKHTMLPart::restoreInterpreterBuiltins): Don't attempt to restore
+	when JavaScript is off.
+        (KWQKHTMLPart::saveWindowProperties): Remove ERROR, since that
+	case is normal when JS is off.
+        (KWQKHTMLPart::saveLocationProperties): Remove ERROR, since that
+	case is normal when JS is off.
+        (KWQKHTMLPart::restoreWindowProperties): Remove ERROR, since that
+	case is normal when JS is off.
+        (KWQKHTMLPart::restoreLocationProperties): Remove ERROR, since that
+	case is normal when JS is off.
+
 2003-07-28  Dave Hyatt  <hyatt at apple.com>
 
 	Fix build bustage on my buggy panther compiler.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index eb3169d..c4734a1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,24 @@
+2003-07-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3343050 - nil-deref in saveInterpreterBuiltins running Sherlock via MallocDebug in Panther7B20
+	- fixed 3343942 - Safari crashes when clicking on link w/ JavaScript turned off
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::saveInterpreterBuiltins): Don't attempt to save
+	when JavaScript is off.
+        (KWQKHTMLPart::restoreInterpreterBuiltins): Don't attempt to restore
+	when JavaScript is off.
+        (KWQKHTMLPart::saveWindowProperties): Remove ERROR, since that
+	case is normal when JS is off.
+        (KWQKHTMLPart::saveLocationProperties): Remove ERROR, since that
+	case is normal when JS is off.
+        (KWQKHTMLPart::restoreWindowProperties): Remove ERROR, since that
+	case is normal when JS is off.
+        (KWQKHTMLPart::restoreLocationProperties): Remove ERROR, since that
+	case is normal when JS is off.
+
 2003-07-28  Dave Hyatt  <hyatt at apple.com>
 
 	Fix build bustage on my buggy panther compiler.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2b0477d..66fa543 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -944,8 +944,6 @@ void KWQKHTMLPart::saveWindowProperties(SavedProperties *windowProperties)
     Window *window = Window::retrieveWindow(this);
     if (window)
         window->saveProperties(*windowProperties);
-    else
-        ERROR("NULL window");
 }
 
 void KWQKHTMLPart::saveLocationProperties(SavedProperties *locationProperties)
@@ -953,8 +951,6 @@ void KWQKHTMLPart::saveLocationProperties(SavedProperties *locationProperties)
     Window *window = Window::retrieveWindow(this);
     if (window)
         window->location()->saveProperties(*locationProperties);
-    else
-        ERROR("NULL window");
 }
 
 void KWQKHTMLPart::restoreWindowProperties(SavedProperties *windowProperties)
@@ -962,8 +958,6 @@ void KWQKHTMLPart::restoreWindowProperties(SavedProperties *windowProperties)
     Window *window = Window::retrieveWindow(this);
     if (window)
         window->restoreProperties(*windowProperties);
-    else
-        ERROR("NULL window");
 }
 
 void KWQKHTMLPart::restoreLocationProperties(SavedProperties *locationProperties)
@@ -971,18 +965,20 @@ void KWQKHTMLPart::restoreLocationProperties(SavedProperties *locationProperties
     Window *window = Window::retrieveWindow(this);
     if (window)
         window->location()->restoreProperties(*locationProperties);
-    else
-        ERROR("NULL window");
 }
 
 void KWQKHTMLPart::saveInterpreterBuiltins(SavedBuiltins &interpreterBuiltins)
 {
-    jScript()->interpreter()->saveBuiltins(interpreterBuiltins);
+    if (jScript() && jScript()->interpreter()) {
+	jScript()->interpreter()->saveBuiltins(interpreterBuiltins);
+    }
 }
 
 void KWQKHTMLPart::restoreInterpreterBuiltins(const SavedBuiltins &interpreterBuiltins)
 {
-    jScript()->interpreter()->restoreBuiltins(interpreterBuiltins);
+    if (jScript() && jScript()->interpreter()) {
+	jScript()->interpreter()->restoreBuiltins(interpreterBuiltins);
+    }
 }
 
 void KWQKHTMLPart::openURLFromPageCache(KWQPageState *state)

-- 
WebKit Debian packaging