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

[bdakin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit be79634804fde5ed7baf1d96f6c6afd3318fe980
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 19:56:57 2010 +0000

    Fix for https://bugs.webkit.org/show_bug.cgi?id=44801 Crash in
    RenderMathMLSubSup::layout()
    -and corresponding-
    <rdar://problem/8325203>
    
    Reviewed by Darin Adler.
    
    Null-check m_scripts. It is null-checked everywhere else in the
    class and can legitimately be null.
    
    * mathml/RenderMathMLSubSup.cpp:
    (WebCore::RenderMathMLSubSup::layout):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66402 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 39d1e2a..e1b67da 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-30  Beth Dakin  <bdakin at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=44801 Crash in 
+        RenderMathMLSubSup::layout()
+        -and corresponding-
+        <rdar://problem/8325203>
+
+        Null-check m_scripts. It is null-checked everywhere else in the 
+        class and can legitimately be null.
+
+        * mathml/RenderMathMLSubSup.cpp:
+        (WebCore::RenderMathMLSubSup::layout):
+
 2010-08-30  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/mathml/RenderMathMLSubSup.cpp b/WebCore/mathml/RenderMathMLSubSup.cpp
index 52ac0e3..4cda36f 100644
--- a/WebCore/mathml/RenderMathMLSubSup.cpp
+++ b/WebCore/mathml/RenderMathMLSubSup.cpp
@@ -162,7 +162,7 @@ void RenderMathMLSubSup::layout()
                     maxHeight = height;
                 current = current->nextSibling();
             }
-            int heightDiff = (m_scripts->offsetHeight() - maxHeight) / 2;
+            int heightDiff = m_scripts ? (m_scripts->offsetHeight() - maxHeight) / 2 : 0;
             if (heightDiff < 0) 
                 heightDiff = 0;
             base->style()->setMarginTop(Length(heightDiff, Fixed));

-- 
WebKit Debian packaging