[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit d5df44e7fb5ce36beb7580f9765319c10978f976
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 8 21:01:38 2004 +0000

            Reviewed by Vicki.
    
            - fixed <rdar://problem/3721544> crash increasing font size;
            entrezeroetun.com (works in IE and Firefox)
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::updateFirstLetter):
            Check for nil originalString() before dereffing
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b969d39..9e9fd9c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-07-08  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Vicki.
+        
+        - fixed <rdar://problem/3721544> crash increasing font size; 
+        entrezeroetun.com (works in IE and Firefox)
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::updateFirstLetter):
+        Check for nil originalString() before dereffing
+
 2004-07-08  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3721453, CSS3 initial property caused crashes because the macros were not written correctly.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 3159e1c..1227efb 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -2799,8 +2799,9 @@ void RenderBlock::updateFirstLetter()
         // string.  We want the original string before it got transformed in case first-letter has
         // no text-transform or a different text-transform applied to it.
         DOMStringImpl* oldText = textObj->originalString();
+        KHTMLAssert(oldText);
         
-        if (oldText->l >= 1) {
+        if (oldText && oldText->l >= 1) {
             unsigned int length = 0;
             while ( length < oldText->l &&
                     ( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct() ) )

-- 
WebKit Debian packaging