[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 13:59:42 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 7bbc336a1b67309d513623a6b4ab5867c0c4318b
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 01:13:37 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46948 Crash with all-
    whitespace separators for mfenced
    
    Reviewed by Adele Peterson.
    
    WebCore:
    
    Check the size of characters instead of separators in case all the
    separators were whitespace.
    
    * mathml/RenderMathMLFenced.cpp:
    (WebCore::RenderMathMLFenced::updateFromElement):
    
    LayoutTests:
    
    * mathml/fenced-whitespace-separators-crash-expected.txt: Added.
    * mathml/fenced-whitespace-separators-crash.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 010ccec..241b326 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-30  Beth Dakin  <bdakin at apple.com>
+
+        Reviewed by Adele Peterson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46948 Crash with all-
+        whitespace separators for mfenced
+
+        * mathml/fenced-whitespace-separators-crash-expected.txt: Added.
+        * mathml/fenced-whitespace-separators-crash.html: Added.
+
 2010-09-30  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Jon Honeycutt.
diff --git a/LayoutTests/mathml/fenced-whitespace-separators-crash-expected.txt b/LayoutTests/mathml/fenced-whitespace-separators-crash-expected.txt
new file mode 100644
index 0000000..7c74f87
--- /dev/null
+++ b/LayoutTests/mathml/fenced-whitespace-separators-crash-expected.txt
@@ -0,0 +1 @@
+vi
diff --git a/LayoutTests/mathml/fenced-whitespace-separators-crash.html b/LayoutTests/mathml/fenced-whitespace-separators-crash.html
new file mode 100644
index 0000000..ce87b7e
--- /dev/null
+++ b/LayoutTests/mathml/fenced-whitespace-separators-crash.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+</script>
+</head>
+
+<body>
+<math>
+    <mfenced separators=" ">
+        <mrow>
+            <mrow>
+                <mi>v</mi>
+            </mrow>
+            <mi>i</mi>
+        </mrow>
+    </mfenced>
+</math>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c5f6754..07f0ca1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-30  Beth Dakin  <bdakin at apple.com>
+
+        Reviewed by Adele Peterson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46948 Crash with all-
+        whitespace separators for mfenced
+
+        Check the size of characters instead of separators in case all the 
+        separators were whitespace.
+
+        * mathml/RenderMathMLFenced.cpp:
+        (WebCore::RenderMathMLFenced::updateFromElement):
+
 2010-09-30  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/mathml/RenderMathMLFenced.cpp b/WebCore/mathml/RenderMathMLFenced.cpp
index 6c0bb0b..2582356 100644
--- a/WebCore/mathml/RenderMathMLFenced.cpp
+++ b/WebCore/mathml/RenderMathMLFenced.cpp
@@ -67,7 +67,7 @@ void RenderMathMLFenced::updateFromElement()
             if (!isSpaceOrNewline(separators[i]))
                 characters.append(separators[i]);
         }
-        m_separators = !separators.length() ? 0 : StringImpl::create(characters.data() , characters.size());
+        m_separators = !characters.size() ? 0 : StringImpl::create(characters.data() , characters.size());
     } else {
         // The separator defaults to a single comma.
         m_separators = StringImpl::create(",");

-- 
WebKit Debian packaging

