[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Wed Apr 7 23:16:18 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 6cff6a98e33f61eacb2e071f2d38aafec78fba25
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 30 13:38:42 2009 +0000

    changelog date
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 46f8ed1..100afab 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-30  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Test that browser doesn't crash in case of stack overflow
+        inside console.log()
+
+        https://bugs.webkit.org/show_bug.cgi?id=30904
+
+        * fast/dom/console-log-stack-overflow-expected.txt: Added.
+        * fast/dom/console-log-stack-overflow.html: Added.
+
 2009-10-30  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/fast/dom/console-log-stack-overflow-expected.txt b/LayoutTests/fast/dom/console-log-stack-overflow-expected.txt
new file mode 100644
index 0000000..91477f5
--- /dev/null
+++ b/LayoutTests/fast/dom/console-log-stack-overflow-expected.txt
@@ -0,0 +1,9 @@
+Regression test for https://bugs.webkit.org/show_bug.cgi?id=30904. This test passes if it doesn't crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/dom/console-log-stack-overflow.html b/LayoutTests/fast/dom/console-log-stack-overflow.html
new file mode 100644
index 0000000..4e794b1
--- /dev/null
+++ b/LayoutTests/fast/dom/console-log-stack-overflow.html
@@ -0,0 +1,29 @@
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body onload='load(1)'>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Regression test for https://bugs.webkit.org/show_bug.cgi?id=30904. This test passes if it doesn't crash.");
+
+// Force a stack-overflow in the console.log
+function load(n) {
+    try {
+      load(n+1);
+    } catch(e) {
+      try {
+        console.log();
+      } catch (g) {
+      }
+    }
+}
+
+var successfullyParsed = true;
+</script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>

-- 
WebKit Debian packaging

