[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 a7a203ce08ab63efea25ccf024e1cb94e687d7ef
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 27 01:15:48 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3156705 - REGRESSION: javascript menus improperly placed at umich.edu store
    
            * kjs/nodes.cpp:
            (StatListNode::execute): If the first statement's completion is
    	not normal, return immediately.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 0b384a6..8b47d73 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-26  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3156705 - REGRESSION: javascript menus improperly placed at umich.edu store
+
+        * kjs/nodes.cpp:
+        (StatListNode::execute): If the first statement's completion is
+	not normal, return immediately.
+
 2003-02-21  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 0b384a6..8b47d73 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-02-26  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3156705 - REGRESSION: javascript menus improperly placed at umich.edu store
+
+        * kjs/nodes.cpp:
+        (StatListNode::execute): If the first statement's completion is
+	not normal, return immediately.
+
 2003-02-21  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index f14cd99..11b9f08 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -1521,6 +1521,9 @@ Completion StatListNode::execute(ExecState *exec)
     exec->clearException();
     return Completion(Throw, ex);
   }
+
+  if (c.complType() != Normal)
+    return c;
   
   Value v = c.value();
   

-- 
WebKit Debian packaging